From 1a81a9e9421610d7f7a02639874c08ff8063ed77 Mon Sep 17 00:00:00 2001 From: Tetiana Meronyk Date: Thu, 14 Dec 2023 15:38:02 +0000 Subject: [PATCH] Revert "Disable multiuser toggle om COPE device and add explanat..." Revert submission 25262217-fix_mu_for_cope Reason for revert: This issue requires a different approach to the solution. Reverted changes: /q/submissionid:25262217-fix_mu_for_cope Change-Id: Ic6e8afd76cb0af88612cf5a6cd34a0c7f50759c4 --- .../android/settings/users/MultiUserSwitchBarController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/users/MultiUserSwitchBarController.java b/src/com/android/settings/users/MultiUserSwitchBarController.java index 238e86ec9dc..33651c31fc4 100644 --- a/src/com/android/settings/users/MultiUserSwitchBarController.java +++ b/src/com/android/settings/users/MultiUserSwitchBarController.java @@ -57,10 +57,11 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw 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());