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

Merge "Clear identity when asking for other users." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-26 15:06:28 +00:00
committed by Android (Google) Code Review
parent dd7efc3287 308093f53b
commit 8eaee9eea5
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2754,12 +2754,17 @@ public class SettingsProvider extends ContentProvider {
mGenerationRegistry.incrementGeneration(key);
if (isGlobalSettingsKey(key)) {
if (Global.LOCATION_GLOBAL_KILL_SWITCH.equals(name)) {
// When the global kill switch is updated, send the
// change notification for the location setting.
notifyLocationChangeForRunningUsers();
final long token = Binder.clearCallingIdentity();
try {
if (Global.LOCATION_GLOBAL_KILL_SWITCH.equals(name)) {
// When the global kill switch is updated, send the
// change notification for the location setting.
notifyLocationChangeForRunningUsers();
}
notifyGlobalSettingChangeForRunningUsers(key, name);
} finally {
Binder.restoreCallingIdentity(token);
}
notifyGlobalSettingChangeForRunningUsers(key, name);
} else {
final int userId = getUserIdFromKey(key);
final Uri uri = getNotificationUriFor(key, name);