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

Commit 4f93b915 authored by Tetiana Meronyk's avatar Tetiana Meronyk
Browse files

Flag removal: FixDisablingOfMuToggleWhenRestrictionApplied 

Bug: 409607273
Test: N/A
Flag: EXEMPT removing fix_disabling_of_mu_toggle_when_restriction_applied
Change-Id: I5e9df1f4bb7c587450f4afdaac3184052ebf77bc
parent 7222dd32

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

+7 −17
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw 
        mUserCapabilities.updateAddUserCapabilities(mContext);

        mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled);



        if (Flags.fixDisablingOfMuToggleWhenRestrictionApplied()) {

        RestrictedLockUtils.EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal

                .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,

                        UserHandle.myUserId());
@@ -71,15 +70,6 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw 
            mSwitchBar.setEnabled(mUserCapabilities.mIsMain

                    && !mUserCapabilities.mDisallowSwitchUser);

        }

        } else {

            if (mUserCapabilities.mDisallowSwitchUser) {

                mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal

                        .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,

                                UserHandle.myUserId()));

            } else {

                mSwitchBar.setEnabled(mUserCapabilities.mIsMain);

            }

        }

    }



    @Override

tests/robotests/src/com/android/settings/users/MultiUserSwitchBarControllerTest.java

+0 −18
Original line number Diff line number Diff line
@@ -23,11 +23,8 @@ import static org.mockito.Mockito.verify; 


import android.content.Context;

import android.content.pm.UserInfo;

import android.multiuser.Flags;

import android.os.UserHandle;

import android.os.UserManager;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -72,19 +69,6 @@ public class MultiUserSwitchBarControllerTest { 
    }



    @Test

    @RequiresFlagsDisabled({Flags.FLAG_FIX_DISABLING_OF_MU_TOGGLE_WHEN_RESTRICTION_APPLIED})

    public void onStart_disallowUserSwitch_shouldSetDisabledByAdmin() {

        mUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),

                UserManager.DISALLOW_USER_SWITCH, true);



        final MultiUserSwitchBarController controller = new MultiUserSwitchBarController(mContext,

                mSwitchWidgetController, null);



        verify(mSwitchWidgetController).setDisabledByAdmin(any());

    }



    @Test

    @RequiresFlagsEnabled({Flags.FLAG_FIX_DISABLING_OF_MU_TOGGLE_WHEN_RESTRICTION_APPLIED})

    public void onStart_disallowUserSwitchEnforcedByAdmin_shouldSetDisabledByAdminUnchecked() {

        int userId = UserHandle.myUserId();

        List<UserManager.EnforcingUser> enforcingUsers = new ArrayList<>();
@@ -102,7 +86,6 @@ public class MultiUserSwitchBarControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled({Flags.FLAG_FIX_DISABLING_OF_MU_TOGGLE_WHEN_RESTRICTION_APPLIED})

    public void onStart_disallowUserSwitch_userNotMain_shouldSetDisabledUnchecked() {

        mUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),

                UserManager.DISALLOW_USER_SWITCH, true);
@@ -114,7 +97,6 @@ public class MultiUserSwitchBarControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled({Flags.FLAG_FIX_DISABLING_OF_MU_TOGGLE_WHEN_RESTRICTION_APPLIED})

    public void onStart_allowUserSwitch_notMainUser_shouldSetDisabled() {

        mUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),

                UserManager.DISALLOW_USER_SWITCH, false);