am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev (02d758a9) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+15 −3

Original line number	Diff line number	Diff line
		@@ -506,7 +506,14 @@ public class SettingsProvider extends ContentProvider {
		}

		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
		if (userHandle == UserHandle.USER_OWNER) {
		fullyPopulateCache(dbHelper, TABLE_GLOBAL, sGlobalCache);
		@@ -611,11 +618,16 @@ public class SettingsProvider extends ContentProvider {

		long oldId = Binder.clearCallingIdentity();
		try {
		DatabaseHelper dbHelper = mOpenHelpers.get(callingUser);
		DatabaseHelper dbHelper;
		synchronized (this) {
		dbHelper = mOpenHelpers.get(callingUser);
		}
		if (null == dbHelper) {
		establishDbTracking(callingUser);
		synchronized (this) {
		dbHelper = mOpenHelpers.get(callingUser);
		}
		}
		return dbHelper;
		} finally {
		Binder.restoreCallingIdentity(oldId);