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

Commit 9347a6fa 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

am: a9f970be

Change-Id: I2315f73a3f84ba1f454f9a76690d1b959508e607
parents 2f690a16 a9f970be
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);