From 9d0791bf6a047dbf7a99034130a5c4b437510fcf Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 10 Oct 2012 00:01:26 -0700
Subject: [PATCH] Fix build, only invalidate when creating user.

Bug: 7276595
Change-Id: I322f9d76a682b2d45fc556e35381442458168fe5
---
 core/java/android/accounts/AccountManagerService.java         | 3 +--
 .../src/android/accounts/AccountManagerServiceTest.java       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index cc90b860d3380..dae38db128598 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)) {
diff --git a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java b/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java
index fd4454d42e846..84c995719a849 100644
--- a/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java
+++ b/core/tests/coretests/src/android/accounts/AccountManagerServiceTest.java
@@ -223,6 +223,10 @@ public class AccountManagerServiceTest extends AndroidTestCase {
                 final RegisteredServicesCacheListener<AuthenticatorDescription> listener,
                 final Handler handler) {
         }
+
+		@Override
+		public void invalidateCache(int userId) {
+		}
     }
 
     static public class MyMockContext extends MockContext {