Merge "Fix a race in settings update." into nyc-dev (df15e03e) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1948,6 +1948,8 @@ public class SettingsProvider extends ContentProvider {
	final int userId = getUserIdFromKey(key);		final int userId = getUserIdFromKey(key);
	Uri uri = getNotificationUriFor(key, name);		Uri uri = getNotificationUriFor(key, name);

			mGenerationRegistry.incrementGeneration(key);

	mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,		mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,
	userId, 0, uri).sendToTarget();		userId, 0, uri).sendToTarget();

	@@ -1959,8 +1961,6 @@ public class SettingsProvider extends ContentProvider {
	sSystemCloneToManagedSettings);		sSystemCloneToManagedSettings);
	}		}

	mGenerationRegistry.incrementGeneration(key);

	mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget();		mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget();
	}		}