diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-21 07:44:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-21 07:44:46 -0700 |
| commit | 8074e98b20ac04fdc032a1ed00dd6763b7e04147 (patch) | |
| tree | bc6f29dced9a3eed7d2cd26b6220034dd9592b17 /core/java/android/content/SyncManager.java | |
| parent | 7707b050f7f0f01819aaa6ccdafe0721c267fdeb (diff) | |
| parent | db6a14cc85cede0769735fdac4da70766989a3ce (diff) | |
Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev
Diffstat (limited to 'core/java/android/content/SyncManager.java')
| -rw-r--r-- | core/java/android/content/SyncManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/content/SyncManager.java b/core/java/android/content/SyncManager.java index bb0c68642d92..05bab9c2d691 100644 --- a/core/java/android/content/SyncManager.java +++ b/core/java/android/content/SyncManager.java @@ -265,7 +265,9 @@ public class SyncManager { } private void doDatabaseCleanup() { - for (UserInfo user : mUserManager.getUsers()) { + for (UserInfo user : mUserManager.getUsers(true)) { + // Skip any partially created/removed users + if (user.partial) continue; Account[] accountsForUser = AccountManagerService.getSingleton().getAccounts(user.id); mSyncStorageEngine.doDatabaseCleanup(accountsForUser, user.id); } |