Merge "Perform permission/appop cleanup on sms kill switch for all users"

2019-02-06 19:29:07 +00:00
parent f324849ab0 95cd4bf8d4
commit 5e02147465
1 changed files with 9 additions and 4 deletions
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -201,10 +201,15 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
                new ContentObserver(getContext().getMainThreadHandler()) {
                    @Override
                    public void onChange(boolean selfChange, Uri uri, int userId) {
-                        getOrCreateControllerService(userId).onSmsKillSwitchToggled(
-                                Settings.Global.getInt(
-                                        getContext().getContentResolver(),
-                                        Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0) == 1);
+                        boolean killSwitchEnabled = Settings.Global.getInt(
+                                getContext().getContentResolver(),
+                                Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0) == 1;
+                        for (int user : mUserManagerInternal.getUserIds()) {
+                            if (mUserManagerInternal.isUserRunning(user)) {
+                                getOrCreateControllerService(user)
+                                        .onSmsKillSwitchToggled(killSwitchEnabled);
+                            }
+                        }
                    }
                }, UserHandle.USER_ALL);
    }