diff options
| author | Fred Quintana <fredq@google.com> | 2009-11-11 17:14:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:14:56 -0800 |
| commit | d73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb (patch) | |
| tree | d20fbb8e4a166258f5f5df22de9632dcc362b9a0 /core/java/android/content | |
| parent | 6d559f9d5688b3e2b027e6fbd5c5cf4f0efbfc09 (diff) | |
| parent | 4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20 (diff) | |
| download | frameworks_base-d73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb.zip frameworks_base-d73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb.tar.gz frameworks_base-d73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb.tar.bz2 | |
am 4cb6fc7e: Merge change Icc48b1e7 into eclair
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-mr2
* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
don't request a sync when temp providers are created
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/AbstractSyncableContentProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/AbstractSyncableContentProvider.java b/core/java/android/content/AbstractSyncableContentProvider.java index cbbc2d8..5903c83 100644 --- a/core/java/android/content/AbstractSyncableContentProvider.java +++ b/core/java/android/content/AbstractSyncableContentProvider.java @@ -135,8 +135,10 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro public void onCreate(SQLiteDatabase db) { bootstrapDatabase(db); mSyncState.createDatabase(db); - ContentResolver.requestSync(null /* all accounts */, + if (!isTemporary()) { + ContentResolver.requestSync(null /* all accounts */, mContentUri.getAuthority(), new Bundle()); + } } @Override |