diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 08:38:03 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 08:38:03 -0700 |
commit | ebb97455327161157432fc0f3effce27990075e5 (patch) | |
tree | 30548a8101de4ac3c248066c07dbef83490f3ad6 /core/java/android/accounts | |
parent | abd0c099c75d85ebca9281c7937b5b5b86f6066f (diff) | |
parent | 62dee3d8ebb3a1d1e0adfb61c9ed505ecf8e2a85 (diff) | |
download | frameworks_base-ebb97455327161157432fc0f3effce27990075e5.zip frameworks_base-ebb97455327161157432fc0f3effce27990075e5.tar.gz frameworks_base-ebb97455327161157432fc0f3effce27990075e5.tar.bz2 |
am 62dee3d8: am 0fca2a3e: Merge "Fix build, only invalidate when creating user." into jb-mr1-dev
* commit '62dee3d8ebb3a1d1e0adfb61c9ed505ecf8e2a85':
Fix build, only invalidate when creating user.
Diffstat (limited to 'core/java/android/accounts')
-rw-r--r-- | core/java/android/accounts/AccountManagerService.java | 3 |
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)) { |