Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f970be authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 8eaee9ee

Change-Id: I64d1f725fe0653ef4512e73d92f411de78664989
parents 2de75aaf 8eaee9ee
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -2754,12 +2754,17 @@ public class SettingsProvider extends ContentProvider {
            mGenerationRegistry.incrementGeneration(key);

            if (isGlobalSettingsKey(key)) {
                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);
                }
            } else {
                final int userId = getUserIdFromKey(key);
                final Uri uri = getNotificationUriFor(key, name);