Merge "Fix an initialization ordering bug due to the userprofile changes."

2012-03-20 16:19:45 -07:00
parent a4a26053ea 70e6190858
commit f57bdf3a2b
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -217,10 +217,10 @@ public class AccountManagerService
        mAuthenticatorCache = authenticatorCache;
        mAuthenticatorCache.setListener(this, null /* Handler */);

-        UserAccounts accounts = initUser(0);
-
        sThis.set(this);

+        UserAccounts accounts = initUser(0);
+
        IntentFilter intentFilter = new IntentFilter();
        intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
        intentFilter.addDataScheme("package");