Commit: 6c6ddf149061ee5cbc1ba4ef73505946416cb21d - development (git)

development

Commit MetaInfo

• Revision: 6c6ddf149061ee5cbc1ba4ef73505946416cb21d (tree)
• Zeit: 2010-12-10 07:26:15
• Autor: Fred Quintana <fredq@goog...>
• Commiter: Android (Google) Code Review

Log Message

Merge "support the changes to the SyncAdapter definition that allow specifying allowParallelSyncs and isAlwaysSyncable"

Ändern Zusammenfassung

• modified: apps/Development/src/com/android/development/SyncAdapterDriver.java

Diff

--- a/apps/Development/src/com/android/development/SyncAdapterDriver.java
+++ b/apps/Development/src/com/android/development/SyncAdapterDriver.java
@@ -367,7 +367,12 @@ public class SyncAdapterDriver extends Activity
                         com.android.internal.R.styleable.SyncAdapter_userVisible, true);
                 final boolean supportsUploading = sa.getBoolean(
                         com.android.internal.R.styleable.SyncAdapter_supportsUploading, true);
-                return new SyncAdapterType(authority, accountType, userVisible, supportsUploading);
+                final boolean isAlwaysSyncable = sa.getBoolean(
+                        com.android.internal.R.styleable.SyncAdapter_isAlwaysSyncable, false);
+                final boolean allowParallelSyncs = sa.getBoolean(
+                        com.android.internal.R.styleable.SyncAdapter_allowParallelSyncs, false);
+                return new SyncAdapterType(authority, accountType, userVisible, supportsUploading,
+                        isAlwaysSyncable, allowParallelSyncs);
             } finally {
                 sa.recycle();
             }