summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/users
diff options
context:
space:
mode:
authorAdam Bookatz <bookatz@google.com>2020-05-19 21:54:36 -0700
committerAdam Bookatz <bookatz@google.com>2020-05-26 23:01:56 +0000
commite7465b0f5ff7f1b810f346356bab573bc9f10fdf (patch)
tree2d055105563ce5234b6e375a1b74536a7c6afe42 /src/com/android/settings/users
parent5c7f6d1b983ce738f671fdb0a22f1ebf58296fe2 (diff)
downloadpackages_apps_Settings-e7465b0f5ff7f1b810f346356bab573bc9f10fdf.tar.gz
packages_apps_Settings-e7465b0f5ff7f1b810f346356bab573bc9f10fdf.tar.bz2
packages_apps_Settings-e7465b0f5ff7f1b810f346356bab573bc9f10fdf.zip
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
Diffstat (limited to 'src/com/android/settings/users')
-rw-r--r--src/com/android/settings/users/MultiUserSwitchBarController.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/settings/users/MultiUserSwitchBarController.java b/src/com/android/settings/users/MultiUserSwitchBarController.java
index a5fdf9b327..58de14963f 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