summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-10 08:42:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-10 08:42:15 -0700
commit86e0935a1f8f87e8d35c3946fa953b6f4519f888 (patch)
tree4f565246e789e4b4d184bd2b53aac420ca784971 /core/java/android/accounts
parent4a55653e341d40db113e6e3763bb366f1d700b4d (diff)
parentebb97455327161157432fc0f3effce27990075e5 (diff)
downloadframeworks_base-86e0935a1f8f87e8d35c3946fa953b6f4519f888.zip
frameworks_base-86e0935a1f8f87e8d35c3946fa953b6f4519f888.tar.gz
frameworks_base-86e0935a1f8f87e8d35c3946fa953b6f4519f888.tar.bz2
am ebb97455: am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev
* commit 'ebb97455327161157432fc0f3effce27990075e5': Fix build, only invalidate when creating user.
Diffstat (limited to 'core/java/android/accounts')
-rw-r--r--core/java/android/accounts/AccountManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index cc90b86..dae38db 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -261,6 +261,7 @@ public class AccountManagerService
accounts = new UserAccounts(mContext, userId);
mUsers.append(userId, accounts);
purgeOldGrants(accounts);
+ mAuthenticatorCache.invalidateCache(accounts.userId);
validateAccountsAndPopulateCache(accounts);
}
return accounts;
@@ -300,8 +301,6 @@ public class AccountManagerService
}
private void validateAccountsAndPopulateCache(UserAccounts accounts) {
- mAuthenticatorCache.invalidateCache(accounts.userId);
-
final HashSet<AuthenticatorDescription> knownAuth = Sets.newHashSet();
for (RegisteredServicesCache.ServiceInfo<AuthenticatorDescription> service :
mAuthenticatorCache.getAllServices(accounts.userId)) {