summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts/GrantCredentialsPermissionActivity.java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-02-14 11:50:53 -0800
committerAmith Yamasani <yamasani@google.com>2012-03-08 10:52:36 -0800
commit04e0d265e3385e9d1fbc35e43c4e8caffbbe3290 (patch)
tree0570669214e6f4f45a81b51c618dfba38a02afae /core/java/android/accounts/GrantCredentialsPermissionActivity.java
parente5d076e8d1a44414edf4cc4796d4c510b8d49518 (diff)
downloadframeworks_base-04e0d265e3385e9d1fbc35e43c4e8caffbbe3290.zip
frameworks_base-04e0d265e3385e9d1fbc35e43c4e8caffbbe3290.tar.gz
frameworks_base-04e0d265e3385e9d1fbc35e43c4e8caffbbe3290.tar.bz2
Make SyncManager and AccountManagerService multi-user aware.
AccountManagerService - Maintain multiple account lists, one per user - Keep multiple databases of accounts - Account db moved to /data/system/users/<userid>/ SyncManager - SyncStorageEngine keeps track of multiple users' accounts. - SyncQueue maintained as a single instance, queueing requests from multiple users. - Changed some methods to take userId arguments - Removed some deadc0de - Store the userId in the SyncOperation, so we know which provider instance to bind to when queued operations are processed. ContentService - Pass along the userid to sync manager calls. ActivityManagerService: - Fixed a bug in cancelIntentSender - Don't bring other user's task forward when resetting tasks. Updated tests Change-Id: If317340ef68e902787aa3f5ceb4cf96f14aea695
Diffstat (limited to 'core/java/android/accounts/GrantCredentialsPermissionActivity.java')
-rw-r--r--core/java/android/accounts/GrantCredentialsPermissionActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/accounts/GrantCredentialsPermissionActivity.java b/core/java/android/accounts/GrantCredentialsPermissionActivity.java
index 0ee683c..4419c8c 100644
--- a/core/java/android/accounts/GrantCredentialsPermissionActivity.java
+++ b/core/java/android/accounts/GrantCredentialsPermissionActivity.java
@@ -113,8 +113,7 @@ public class GrantCredentialsPermissionActivity extends Activity implements View
}
};
- accountManagerService.getAuthTokenLabel(
- response, mAccount, mAuthTokenType);
+ accountManagerService.getAuthTokenLabel(response, mAccount, mAuthTokenType, mUid);
findViewById(R.id.allow_button).setOnClickListener(this);
findViewById(R.id.deny_button).setOnClickListener(this);