drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-10 22:38:30 -07:00
committed by Android (Google) Code Review
parent eb214524be 9535c915b6
commit 31cee479fc
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/SyncManager.java
View File

@ -219,20 +219,13 @@ public class SyncManager {
// Use this as a random offset to seed all periodic syncs // Use this as a random offset to seed all periodic syncs
private int mSyncRandomOffsetMillis; 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_MIN = 30 * 1000; // 30 seconds
private static final long SYNC_ALARM_TIMEOUT_MAX = 2 * 60 * 60 * 1000; // two hours 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() { private List<UserInfo> getAllUsers() {
return getUserManager().getUsers(); return mUserManager.getUsers();
} }
private boolean containsAccountAndUser(AccountAndUser[] accounts, Account account, int userId) { private boolean containsAccountAndUser(AccountAndUser[] accounts, Account account, int userId) {
@ -337,6 +330,7 @@ public class SyncManager {
// Initialize the SyncStorageEngine first, before registering observers // Initialize the SyncStorageEngine first, before registering observers
// and creating threads and so on; it may fail if the disk is full. // and creating threads and so on; it may fail if the disk is full.
mContext = context; mContext = context;
SyncStorageEngine.init(context); SyncStorageEngine.init(context);
mSyncStorageEngine = SyncStorageEngine.getSingleton(); mSyncStorageEngine = SyncStorageEngine.getSingleton();
mSyncStorageEngine.setOnSyncRequestListener(new OnSyncRequestListener() { mSyncStorageEngine.setOnSyncRequestListener(new OnSyncRequestListener() {
@ -402,6 +396,7 @@ public class SyncManager {
mNotificationMgr = null; mNotificationMgr = null;
} }
mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); 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 // 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 // a sync alarm notification and when we finish processing it. We need to do this