Merge "Perform permission/appop cleanup on sms kill switch for all users" (5e021474) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/role/RoleManagerService.java

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -201,10 +201,15 @@ public class RoleManagerService extends SystemService implements RoleUserState.C
	new ContentObserver(getContext().getMainThreadHandler()) {		new ContentObserver(getContext().getMainThreadHandler()) {
	@Override		@Override
	public void onChange(boolean selfChange, Uri uri, int userId) {		public void onChange(boolean selfChange, Uri uri, int userId) {
	getOrCreateControllerService(userId).onSmsKillSwitchToggled(		boolean killSwitchEnabled = Settings.Global.getInt(
	Settings.Global.getInt(
	getContext().getContentResolver(),		getContext().getContentResolver(),
	Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0) == 1);		Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0) == 1;
			for (int user : mUserManagerInternal.getUserIds()) {
			if (mUserManagerInternal.isUserRunning(user)) {
			getOrCreateControllerService(user)
			.onSmsKillSwitchToggled(killSwitchEnabled);
			}
			}
	}		}
	}, UserHandle.USER_ALL);		}, UserHandle.USER_ALL);
	}		}