diff options
author | Amith Yamasani <yamasani@google.com> | 2012-10-10 22:38:30 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 22:38:31 -0700 |
commit | 31cee479fc43fc422b481f6360fa499a7b4fc70a (patch) | |
tree | d57a52c517435a6cc4abcffaeed3d96db5fe5632 /core | |
parent | eb214524be8b41a246b4e544cf5cbf30b16497f2 (diff) | |
parent | 9535c915b61c43d7b4bdb2b35d53774cfb16bfbb (diff) | |
download | frameworks_base-31cee479fc43fc422b481f6360fa499a7b4fc70a.zip frameworks_base-31cee479fc43fc422b481f6360fa499a7b4fc70a.tar.gz frameworks_base-31cee479fc43fc422b481f6360fa499a7b4fc70a.tar.bz2 |
Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/content/SyncManager.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index 93c9526..e0e2995 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -219,20 +219,13 @@ public class SyncManager { // Use this as a random offset to seed all periodic syncs private int mSyncRandomOffsetMillis; - private UserManager mUserManager; + private final UserManager mUserManager; private static final long SYNC_ALARM_TIMEOUT_MIN = 30 * 1000; // 30 seconds private static final long SYNC_ALARM_TIMEOUT_MAX = 2 * 60 * 60 * 1000; // two hours - private UserManager getUserManager() { - if (mUserManager == null) { - mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); - } - return mUserManager; - } - private List<UserInfo> getAllUsers() { - return getUserManager().getUsers(); + return mUserManager.getUsers(); } private boolean containsAccountAndUser(AccountAndUser[] accounts, Account account, int userId) { @@ -337,6 +330,7 @@ public class SyncManager { // Initialize the SyncStorageEngine first, before registering observers // and creating threads and so on; it may fail if the disk is full. mContext = context; + SyncStorageEngine.init(context); mSyncStorageEngine = SyncStorageEngine.getSingleton(); mSyncStorageEngine.setOnSyncRequestListener(new OnSyncRequestListener() { @@ -402,6 +396,7 @@ public class SyncManager { mNotificationMgr = null; } mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); + mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); // This WakeLock is used to ensure that we stay awake between the time that we receive // a sync alarm notification and when we finish processing it. We need to do this |