commit aaa30f98139942f0bd73f052dc3d05888fdcd65c
author Daniel Chapin <chapin@google.com> Tue Apr 14 15:47:48 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 15 17:53:13 2020 +0000
tree f8e3d43a6fc24300f375eccfba4822f9eee49ec8
parent 281fb53b72b0dc6d2e42bd552a55c7ddb89b0a03

Revert "Don't write user_switcher_enabled value when enter this Settings"

This reverts commit 898d6b4d73f40b08a91f69dbdf3b67550f1df198.

Reason for revert: Causing a regression
Bug: 153944718

Change-Id: If96441618d32a65b0bae4c5c26fb3b278556cc8c
(cherry picked from commit 77c41c1a5ab0f9ea1a4f55f41ade1e3193bc6532)

src/com/android/settings/users/MultiUserSwitchBarController.java

diff --git a/src/com/android/settings/users/MultiUserSwitchBarController.java b/src/com/android/settings/users/MultiUserSwitchBarController.java
index 58de149..a5fdf9b 100644
--- a/src/com/android/settings/users/MultiUserSwitchBarController.java
+++ b/src/com/android/settings/users/MultiUserSwitchBarController.java
@@ -52,6 +52,8 @@
         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