From e7465b0f5ff7f1b810f346356bab573bc9f10fdf Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Tue, 19 May 2020 21:54:36 -0700 Subject: [PATCH] Opening Multiuser doesn't toggle it on This does the following: Simply opening Settings > Multiuser no longer globally enables multiuser. The user would have to actively toggle that switch to globally enabled it. (This reverts ag/7002640; a different solution for that cl's bug is in the same topic as this cl.) Bug: 137943217 Bug: 141372193 Bug: 149973281 Bug: 130270878 Test: manual: Settings > Multiuser doesn't turn on the systemui avatar Test: manual: adb shell pm create-user A, does turn on sysui avatar Change-Id: Ibfdd1dee408c7214d0a097c8d814dae87ffa82ac --- .../android/settings/users/MultiUserSwitchBarController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/android/settings/users/MultiUserSwitchBarController.java b/src/com/android/settings/users/MultiUserSwitchBarController.java index a5fdf9b3279..58de14963fa 100644 --- a/src/com/android/settings/users/MultiUserSwitchBarController.java +++ b/src/com/android/settings/users/MultiUserSwitchBarController.java @@ -52,8 +52,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw mListener = listener; mUserCapabilities = UserCapabilities.create(context); mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled); - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.USER_SWITCHER_ENABLED, mSwitchBar.isChecked() ? 1 : 0); if (mUserCapabilities.mDisallowSwitchUser) { mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal