Merge "Fix a race in settings update." into nyc-dev

This commit is contained in:
Phil Weaver
2016-05-12 15:43:07 +00:00
committed by Android (Google) Code Review

View File

@ -1948,6 +1948,8 @@ public class SettingsProvider extends ContentProvider {
final int userId = getUserIdFromKey(key);
Uri uri = getNotificationUriFor(key, name);
mGenerationRegistry.incrementGeneration(key);
mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,
userId, 0, uri).sendToTarget();
@ -1959,8 +1961,6 @@ public class SettingsProvider extends ContentProvider {
sSystemCloneToManagedSettings);
}
mGenerationRegistry.incrementGeneration(key);
mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget();
}