PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set availability of AddUserWhenLockedPreference before it gets displayed." into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-22 10:14:21 +00:00
committed by Android (Google) Code Review
parent e72b2d2be1 b0706be4af
commit 7cbf627778
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
View File

@@ -46,8 +46,6 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
restrictedSwitchPreference.setVisible(true); restrictedSwitchPreference.setVisible(true);
if (mUserCaps.mDisallowAddUserSetByAdmin) { if (mUserCaps.mDisallowAddUserSetByAdmin) {
restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin); restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
} else if (mUserCaps.mDisallowAddUser) {
restrictedSwitchPreference.setVisible(false);
} }
} else { } else {
restrictedSwitchPreference.setDisabledByAdmin( restrictedSwitchPreference.setDisabledByAdmin(
@@ -62,7 +60,11 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr
if (!mUserCaps.isAdmin()) { if (!mUserCaps.isAdmin()) {
return DISABLED_FOR_USER; return DISABLED_FOR_USER;
} else if (android.multiuser.Flags.newMultiuserSettingsUx()) { } else if (android.multiuser.Flags.newMultiuserSettingsUx()) {
return AVAILABLE; if (mUserCaps.mDisallowAddUser && !mUserCaps.mDisallowAddUserSetByAdmin) {
return DISABLED_FOR_USER;
} else {
return AVAILABLE;
}
} else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) { } else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER; return DISABLED_FOR_USER;
} else { } else {