diff options
| author | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
|---|---|---|
| committer | Tom Taylor <tomtaylor@google.com> | 2009-12-22 10:11:55 -0800 |
| commit | f0108cda21bec61418b24aa6217406072780b5d5 (patch) | |
| tree | 8866dfdec50a4bff63f188784779f7e1a9aa0216 /core/java/android/content/SyncStorageEngine.java | |
| parent | fddd8f96f34b622cbdd0d891f8a7f5b7e18fdbf8 (diff) | |
| parent | ad2fa35d888e0763bfef0fc060775bec5d169479 (diff) | |
| download | frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.zip frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.gz frameworks_base-f0108cda21bec61418b24aa6217406072780b5d5.tar.bz2 | |
resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
Diffstat (limited to 'core/java/android/content/SyncStorageEngine.java')
| -rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index b6bb7db..4c53201 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -16,6 +16,10 @@ package android.content; +import com.android.internal.os.AtomicFile; +import com.android.internal.util.ArrayUtils; +import com.android.common.FastXmlSerializer; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; @@ -37,10 +41,6 @@ import android.util.Log; import android.util.SparseArray; import android.util.Xml; -import com.android.internal.os.AtomicFile; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.FastXmlSerializer; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -512,7 +512,7 @@ public class SyncStorageEngine extends Handler { SyncStatusInfo status = getOrCreateSyncStatusLocked(authority.ident); status.pending = true; - status.initialize = op.extras != null && + status.initialize = op.extras != null && op.extras.containsKey(ContentResolver.SYNC_EXTRAS_INITIALIZE) && op.extras.getBoolean(ContentResolver.SYNC_EXTRAS_INITIALIZE); } |