From bcc1cb9fc01b0acedcf7954344940df7c55fdf53 Mon Sep 17 00:00:00 2001
From: Fred Quintana <fredq@google.com>
Date: Thu, 25 Aug 2011 11:27:08 -0700
Subject: [PATCH] Make the sync adapter driver understand the new
 settingsActivity parameter.

Bug: 5204776
Change-Id: I66c5f40f8cc460479232ecdb71c4e8e0495058c3
---
 .../src/com/android/development/SyncAdapterDriver.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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();
             }