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

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

Browse Source 
am: df15e03ed0

* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
  Fix a race in settings update.

Change-Id: I970606b21b1a5cd2d19e0f21077636e68f107c6b
This commit is contained in:
Phil Weaver
2016-05-12 16:53:49 +00:00
committed by android-build-merger
parent 94ad652c7a df15e03ed0
commit d56cd1fcab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
} }