summaryrefslogtreecommitdiff
path: root/apps/Development/src/com/android/development/SyncAdapterDriver.java
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2011-08-25 11:27:08 -0700
committerFred Quintana <fredq@google.com>2011-08-25 11:27:08 -0700
commitbcc1cb9fc01b0acedcf7954344940df7c55fdf53 (patch)
treee484d687de47f7edc8c35bda1b012b8813e148d7 /apps/Development/src/com/android/development/SyncAdapterDriver.java
parent61c9cbb8b40e37fac335fde91207bf2fc410f6af (diff)
Make the sync adapter driver understand the new settingsActivity
parameter. Bug: 5204776 Change-Id: I66c5f40f8cc460479232ecdb71c4e8e0495058c3
Diffstat (limited to 'apps/Development/src/com/android/development/SyncAdapterDriver.java')
-rw-r--r--apps/Development/src/com/android/development/SyncAdapterDriver.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/Development/src/com/android/development/SyncAdapterDriver.java b/apps/Development/src/com/android/development/SyncAdapterDriver.java
index 0fde732a1..3a219039e 100644
--- a/apps/Development/src/com/android/development/SyncAdapterDriver.java
+++ b/apps/Development/src/com/android/development/SyncAdapterDriver.java
@@ -371,8 +371,11 @@ public class SyncAdapterDriver extends Activity
com.android.internal.R.styleable.SyncAdapter_isAlwaysSyncable, false);
final boolean allowParallelSyncs = sa.getBoolean(
com.android.internal.R.styleable.SyncAdapter_allowParallelSyncs, false);
+ final String settingsActivity =
+ sa.getString(com.android.internal.R.styleable
+ .SyncAdapter_settingsActivity);
return new SyncAdapterType(authority, accountType, userVisible, supportsUploading,
- isAlwaysSyncable, allowParallelSyncs);
+ isAlwaysSyncable, allowParallelSyncs, settingsActivity);
} finally {
sa.recycle();
}