commit 91aa126ead46ce9af994a07c8f165ba6cb1f1bc0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 28 02:34:22 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 28 02:34:22 2023 +0000
tree 2f8399a420b756bc939053356a4962f132610987
parent 1e10fb67a9057f4085f0e1c1cdc517b2448aa8e0
parent f37ddd70296a85b7f88cd56910515de31c9c66ab

Merge cherrypicks of ['googleplex-android-review.googlesource.com/25642236'] into 24Q1-release.

Change-Id: I37c1ed6d566efe3104b342f22a5ff52c9e459efc

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 238e86e..33651c3 100644
--- a/src/com/android/settings/users/MultiUserSwitchBarController.java
+++ b/src/com/android/settings/users/MultiUserSwitchBarController.java
@@ -57,10 +57,11 @@
             mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
                     .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
                             UserHandle.myUserId()));
+
         } else if (mUserCapabilities.mDisallowAddUser) {
-            onSwitchToggled(false);
             mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
-                    .checkIfAddUserDisallowed(mContext, UserHandle.myUserId()));
+                    .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_ADD_USER,
+                            UserHandle.myUserId()));
         } else {
             mSwitchBar.setEnabled(!mUserCapabilities.mDisallowSwitchUser
                     && !mUserCapabilities.mIsGuest && mUserCapabilities.isAdmin());