summaryrefslogtreecommitdiffstats
path: root/core/java/android/accounts
diff options
context:
space:
mode:
authorFred Quintana <fredq@google.com>2012-03-20 16:19:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-20 16:19:45 -0700
commitf57bdf3a2b5b8833fc1ded877bbf6ed232205d1e (patch)
treeebb0667997847dd9b111b770192f73fef396997c /core/java/android/accounts
parenta4a26053ea91a90c824ef98f17552c34bd89207e (diff)
parent70e6190858e54b0924ed0a536030e61d471181b2 (diff)
downloadframeworks_base-f57bdf3a2b5b8833fc1ded877bbf6ed232205d1e.zip
frameworks_base-f57bdf3a2b5b8833fc1ded877bbf6ed232205d1e.tar.gz
frameworks_base-f57bdf3a2b5b8833fc1ded877bbf6ed232205d1e.tar.bz2
Merge "Fix an initialization ordering bug due to the userprofile changes."
Diffstat (limited to 'core/java/android/accounts')
-rw-r--r--core/java/android/accounts/AccountManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index cf1e8f3..27c9c8b 100644
--- 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");