| /frameworks/base/docs/html/training/cloudsave/ |
| D | conflict-res.jd | 11 .conflict {
20 <li><a href="#conflict">Get Notified of Conflicts</a></li>
39 <p>This article describes how to design a robust conflict resolution strategy for
50 to save data to the cloud, the saves might conflict, and you must decide how to
52 your conflict resolution can be, so you must design your data carefully in order
53 to allow your conflict resolution logic to handle each case correctly.</p>
60 <h2 id="conflict">Get Notified of Conflicts</h2>
73 // resolve conflict, then call mAppStateClient.resolveConflict()
79 up to you to implement this conflict resolution logic.</p>
84 the data. Specifically, if the Google Play services application detects a conflict
[all …]
|
| /frameworks/base/docs/html/tools/building/ |
| D | manifest-merge.jd | 40 different attribute value that does not resolve based on the default merge conflict rules.
109 <td>Merge if settings match, otherwise causes conflict error.</td>
130 the <code>overrideLibrary</code> conflict marker is used.
156 specific conflict resolutions. For example, use a conflict marker to
161 <h3 id="conflict-markers">Merge Conflict Markers</h3>
162 <p>A merge conflict marker is a special attribute in the Android tools namespace that defines a
163 specific merge conflict resolution. Create a conflict marker to avoid a merge conflict error for
164 conflicts not resolved by the default merge rules. Supported merge conflict markers include:</p>
175 values generate a build failure, unless resolved through the conflict rules.</dd>
185 <p>By default, the manifest merge process applies the <code>merge</code> conflict marker to
[all …]
|
| /frameworks/compile/mclinker/include/mcld/LD/ |
| D | DiagLayouts.inc | 21 "Illegal section mapping rule: %0 -> %1. (conflict with %2 -> %3)",
22 "Illegal section mapping rule: %0 -> %1. (conflict with %2 -> %3)")
|
| /frameworks/rs/cpu_ref/ |
| D | rsCpuScriptGroup2.h | 46 bool conflict(CPUClosure* closure) const;
|
| D | rsCpuScriptGroup2.cpp | 99 bool Batch::conflict(CPUClosure* cpuClosure) const { in conflict() function in android::renderscript::Batch
175 if (batch->conflict(cc)) { in CpuScriptGroup2Impl()
|
| /frameworks/base/services/core/java/com/android/server/content/ |
| D | SyncManager.java | 2663 ActiveSyncContext conflict = null; in maybeStartNextSyncH() local
2683 conflict = activeSyncContext; in maybeStartNextSyncH()
2698 Log.v(TAG, " conflict: " + conflict); in maybeStartNextSyncH()
2706 if (conflict != null) { in maybeStartNextSyncH()
2707 if (candidateIsInitialization && !conflict.mSyncOperation.isInitialization() in maybeStartNextSyncH()
2709 toReschedule = conflict; in maybeStartNextSyncH()
2712 + "takes higher priority, " + conflict); in maybeStartNextSyncH()
2714 } else if (candidate.isExpedited() && !conflict.mSyncOperation.isExpedited() in maybeStartNextSyncH()
2716 == conflict.mSyncOperation.isInitialization())) { in maybeStartNextSyncH()
2717 toReschedule = conflict; in maybeStartNextSyncH()
[all …]
|
| /frameworks/base/docs/html/training/connect-devices-wirelessly/ |
| D | nsd.jd | 76 network, and Android automatically handles conflict resolution. If
101 that your application always uses port 1337 puts it in potential conflict with
136 // resolve a conflict, so update the name you initially requested
|
| /frameworks/base/docs/html/tools/debugging/ |
| D | annotations.jd | 120 <strong>Analyze > Inspect Code</strong> from the menu options. Android Studio displays conflict
131 attached to that parameter, building the code generates a warning indicating a non-null conflict. <…
|
| /frameworks/base/docs/html/training/transitions/ |
| D | custom-transitions.jd | 83 <p>To ensure that the key for a property value does not conflict with other {@link
|
| /frameworks/base/docs/html/guide/topics/connectivity/nfc/ |
| D | hce.jd | 350 a different conflict resolution policy.</p>
354 be to always ask the user which service is to be invoked in case of conflict. To
355 query the conflict resolution policy for a certain category, see
|
| /frameworks/base/docs/html/tools/revisions/ |
| D | gradle-plugin.jd | 295 resolve the conflict. </li>
|
| /frameworks/base/docs/html/sdk/ |
| D | terms.jd | 136 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| D | win-usb.jd | 144 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| D | index.jd | 234 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| /frameworks/base/docs/html/preview/ |
| D | license.jd | 140 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| D | download.jd | 144 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| D | download_mp2.jd | 144 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| D | download_mp1.jd | 144 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| /frameworks/base/docs/html/google/backup/ |
| D | terms.jd | 500 by the laws of the State of California without regard to its conflict of laws
|
| D | signup.jd | 187 …e governed by the laws of the State of California without regard to its conflict of laws provision…
|
| /frameworks/base/docs/html/ndk/guides/ |
| D | standalone_toolchain.jd | 603 this name would conflict at runtime with the system's own minimal C++ runtime. For this reason,
|
| /frameworks/base/docs/html/ndk/downloads/ |
| D | index.jd | 300 be governed by the laws of the State of California without regard to its conflict of laws
|
| /frameworks/base/docs/html/tools/testing/ |
| D | testing_android.jd | 606 <code>R.java</code> class in your test package, because it will then conflict with the
|
| /frameworks/base/docs/html/ndk/reference/ |
| D | group___configuration.jd | 997 …urns 0 if there are any values in 'base' that conflict with 'requested'. Returns 1 if it does not …
|
| /frameworks/base/docs/html/guide/components/ |
| D | tasks-and-back-stack.jd | 266 Be sure to test for navigation behaviors that might conflict with the user's expected behavior.</p>
|