drgreen/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 am: df15e03ed0

Browse Source 
am: d56cd1fcab

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

Change-Id: Ia9cee330dafdad14369ca5025ddc4d2710d76a59
This commit is contained in:
Phil Weaver
2016-05-12 16:56:14 +00:00
committed by android-build-merger
parent fbb267d4f4 d56cd1fcab
commit f383e56846
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);
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();
}