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

Merge "Notify all running users of DeviceConfig changes" into qt-dev am: b26792a2ca

Browse Source 
am: fff8fe61ab

Change-Id: I3bc4aaed20311c3ab938840fc75bceb3c7632930
This commit is contained in:
Linus Tufvesson
2019-05-31 02:33:08 -07:00
committed by android-build-merger
parent 35fe9eccce fff8fe61ab
commit a216a4995f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3046,15 +3046,16 @@ public class SettingsProvider extends ContentProvider {
// Increment the generation first, so observers always see the new value
mGenerationRegistry.incrementGeneration(key);
if (isGlobalSettingsKey(key)) {
if (isGlobalSettingsKey(key) || isConfigSettingsKey(key)) {
final long token = Binder.clearCallingIdentity();
try {
if (Global.LOCATION_GLOBAL_KILL_SWITCH.equals(name)) {
if (Global.LOCATION_GLOBAL_KILL_SWITCH.equals(name)
&& isGlobalSettingsKey(key)) {
// When the global kill switch is updated, send the
// change notification for the location setting.
notifyLocationChangeForRunningUsers();
}
notifyGlobalSettingChangeForRunningUsers(key, name);
notifySettingChangeForRunningUsers(key, name);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -3094,7 +3095,7 @@ public class SettingsProvider extends ContentProvider {
}
}
private void notifyGlobalSettingChangeForRunningUsers(int key, String name) {
private void notifySettingChangeForRunningUsers(int key, String name) {
// Important: No need to update generation for each user as there
// is a singleton generation entry for the global settings which
// is already incremented be the caller.