Merge change Icc48b1e7 into eclair

* changes: don't request a sync when temp providers are created
2009-11-11 15:15:55 -08:00
parent bf5b632abb cc48b1e77d
commit 4cb6fc7ed2
1 changed files with 3 additions and 1 deletions
--- 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