Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cbf6277 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents e72b2d2b b0706be4

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

+5 −3
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
                restrictedSwitchPreference.setVisible(true);

                if (mUserCaps.mDisallowAddUserSetByAdmin) {

                    restrictedSwitchPreference.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);

                } else if (mUserCaps.mDisallowAddUser) {

                    restrictedSwitchPreference.setVisible(false);

                }

            } else {

                restrictedSwitchPreference.setDisabledByAdmin(
@@ -62,7 +60,11 @@ public class AddUserWhenLockedPreferenceController extends TogglePreferenceContr 
        if (!mUserCaps.isAdmin()) {

            return DISABLED_FOR_USER;

        } else if (android.multiuser.Flags.newMultiuserSettingsUx()) {

            if (mUserCaps.mDisallowAddUser && !mUserCaps.mDisallowAddUserSetByAdmin) {

                return DISABLED_FOR_USER;

            } else {

                return AVAILABLE;

            }

        } else if (mUserCaps.disallowAddUser() || mUserCaps.disallowAddUserSetByAdmin()) {

            return DISABLED_FOR_USER;

        } else {