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

Commit e539c886 authored by Esteban Talavera's avatar Esteban Talavera Committed by Android (Google) Code Review
Browse files

Merge "Check new user restriction for profile removal"

parents b521aeb9 50e515e5

src/com/android/settings/accounts/AccountPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import java.util.List; 


import static android.content.Intent.EXTRA_USER;

import static android.os.UserManager.DISALLOW_MODIFY_ACCOUNTS;

import static android.os.UserManager.DISALLOW_REMOVE_MANAGED_PROFILE;

import static android.os.UserManager.DISALLOW_REMOVE_USER;

import static android.provider.Settings.EXTRA_AUTHORITIES;
@@ -171,7 +172,7 @@ public class AccountPreferenceController extends PreferenceController 
                    rawData.add(data);

                }

                if (userInfo.isManagedProfile()) {

                    if (!mHelper.hasBaseUserRestriction(DISALLOW_REMOVE_USER,

                    if (!mHelper.hasBaseUserRestriction(DISALLOW_REMOVE_MANAGED_PROFILE,

                        UserHandle.myUserId())) {

                        SearchIndexableRaw data = new SearchIndexableRaw(mContext);

                        data.title = res.getString(R.string.remove_managed_profile_label);
@@ -305,7 +306,7 @@ public class AccountPreferenceController extends PreferenceController 
                mContext.getString(R.string.accessibility_category_work, workGroupSummary));

            profileData.removeWorkProfilePreference = newRemoveWorkProfilePreference(context);

            mHelper.enforceRestrictionOnPreference(profileData.removeWorkProfilePreference,

                DISALLOW_REMOVE_USER, UserHandle.myUserId());

                DISALLOW_REMOVE_MANAGED_PROFILE, UserHandle.myUserId());

            profileData.managedProfilePreference = newManagedProfileSettings();

        } else {

            preferenceGroup.setTitle(R.string.category_personal);

tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ public class AccountPreferenceControllerTest { 
        infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE));

        when(mUserManager.isManagedProfile()).thenReturn(false);

        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);

        when(mAccountHelper.hasBaseUserRestriction(eq(UserManager.DISALLOW_REMOVE_USER), anyInt()))

        when(mAccountHelper.hasBaseUserRestriction(

                eq(UserManager.DISALLOW_REMOVE_MANAGED_PROFILE), anyInt()))

            .thenReturn(true);



        mController.updateRawDataToIndex(data);