Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 02b4caf5: am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev

Browse Source 
* commit '02b4caf5f74b9099a56f6e1ed30460f802657f41':
  Fix issue #17811029: Settings provider race when removing users
This commit is contained in:
Dianne Hackborn
2014-10-03 21:43:24 +00:00
committed by Android Git Automerger
parent 26c2e5a0de 02b4caf5f7
commit d6bcda99b0
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -506,7 +506,14 @@ public class SettingsProvider extends ContentProvider {
} }
private void fullyPopulateCaches(final int userHandle) { private void fullyPopulateCaches(final int userHandle) {
DatabaseHelper dbHelper = mOpenHelpers.get(userHandle); DatabaseHelper dbHelper;
synchronized (this) {
dbHelper = mOpenHelpers.get(userHandle);
}
if (dbHelper == null) {
// User is gone.
return;
}
// Only populate the globals cache once, for the owning user // Only populate the globals cache once, for the owning user
if (userHandle == UserHandle.USER_OWNER) { if (userHandle == UserHandle.USER_OWNER) {
fullyPopulateCache(dbHelper, TABLE_GLOBAL, sGlobalCache); fullyPopulateCache(dbHelper, TABLE_GLOBAL, sGlobalCache);
@@ -611,10 +618,15 @@ public class SettingsProvider extends ContentProvider {
long oldId = Binder.clearCallingIdentity(); long oldId = Binder.clearCallingIdentity();
try { try {
DatabaseHelper dbHelper = mOpenHelpers.get(callingUser); DatabaseHelper dbHelper;
synchronized (this) {
dbHelper = mOpenHelpers.get(callingUser);
}
if (null == dbHelper) { if (null == dbHelper) {
establishDbTracking(callingUser); establishDbTracking(callingUser);
dbHelper = mOpenHelpers.get(callingUser); synchronized (this) {
dbHelper = mOpenHelpers.get(callingUser);
}
} }
return dbHelper; return dbHelper;
} finally { } finally {