Merge change Icc48b1e7 into eclair

* changes:
  don't request a sync when temp providers are created

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/content/AbstractSyncableContentProvider.java b/core/java/android/content/AbstractSyncableContentProvider.java
index fbe3548e8a02..371627408498 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