Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build, only invalidate when creating user." into jb-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-10-10 00:09:51 -07:00
committed by Android (Google) Code Review
parent c85e16cafb 9d0791bf6a
commit 0fca2a3e22
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accounts/AccountManagerService.java
View File

@@ -261,6 +261,7 @@ public class AccountManagerService
accounts = new UserAccounts(mContext, userId); accounts = new UserAccounts(mContext, userId);
mUsers.append(userId, accounts); mUsers.append(userId, accounts);
purgeOldGrants(accounts); purgeOldGrants(accounts);
mAuthenticatorCache.invalidateCache(accounts.userId);
validateAccountsAndPopulateCache(accounts); validateAccountsAndPopulateCache(accounts);
} }
return accounts; return accounts;
@@ -300,8 +301,6 @@ public class AccountManagerService
} }
private void validateAccountsAndPopulateCache(UserAccounts accounts) { private void validateAccountsAndPopulateCache(UserAccounts accounts) {
mAuthenticatorCache.invalidateCache(accounts.userId);
final HashSet<AuthenticatorDescription> knownAuth = Sets.newHashSet(); final HashSet<AuthenticatorDescription> knownAuth = Sets.newHashSet();
for (RegisteredServicesCache.ServiceInfo<AuthenticatorDescription> service : for (RegisteredServicesCache.ServiceInfo<AuthenticatorDescription> service :
mAuthenticatorCache.getAllServices(accounts.userId)) { mAuthenticatorCache.getAllServices(accounts.userId)) {

4
core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java
View File

@@ -223,6 +223,10 @@ public class AccountManagerServiceTest extends AndroidTestCase {
final RegisteredServicesCacheListener<AuthenticatorDescription> listener, final RegisteredServicesCacheListener<AuthenticatorDescription> listener,
final Handler handler) { final Handler handler) {
} }
@Override
public void invalidateCache(int userId) {
}
} }
static public class MyMockContext extends MockContext { static public class MyMockContext extends MockContext {