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

Commit 7c6ec7b7 authored by Himanshu Gupta's avatar Himanshu Gupta Committed by Android (Google) Code Review
Browse files

Merge "Removing permissions for mItemsRestrictedOnHomeScreen UserProperty" into main

parents 0b72dd53 b4936217

core/java/android/content/pm/UserProperties.java

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ public final class UserProperties implements Parcelable { 
            setDeleteAppWithParent(orig.getDeleteAppWithParent());

            setAlwaysVisible(orig.getAlwaysVisible());

            setAllowStoppingUserWithDelayedLocking(orig.getAllowStoppingUserWithDelayedLocking());

            setItemsRestrictedOnHomeScreen(orig.areItemsRestrictedOnHomeScreen());

        }

        if (hasManagePermission) {

            // Add items that require MANAGE_USERS or stronger.
@@ -557,6 +556,7 @@ public final class UserProperties implements Parcelable { 
        setShowInSharingSurfaces(orig.getShowInSharingSurfaces());

        setCrossProfileContentSharingStrategy(orig.getCrossProfileContentSharingStrategy());

        setProfileApiVisibility(orig.getProfileApiVisibility());

        setItemsRestrictedOnHomeScreen(orig.areItemsRestrictedOnHomeScreen());

    }



    /**

services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserPropertiesTest.java

+2 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ public class UserManagerServiceUserPropertiesTest { 
        assertEqualGetterOrThrows(orig::getAlwaysVisible, copy::getAlwaysVisible, exposeAll);

        assertEqualGetterOrThrows(orig::getAllowStoppingUserWithDelayedLocking,

                copy::getAllowStoppingUserWithDelayedLocking, exposeAll);

        assertEqualGetterOrThrows(orig::areItemsRestrictedOnHomeScreen,

                copy::areItemsRestrictedOnHomeScreen, exposeAll);



        // Items requiring hasManagePermission - put them here using hasManagePermission.

        assertEqualGetterOrThrows(orig::getShowInSettings, copy::getShowInSettings,
@@ -220,6 +218,8 @@ public class UserManagerServiceUserPropertiesTest { 
                copy::getCrossProfileContentSharingStrategy, true);

        assertEqualGetterOrThrows(orig::getProfileApiVisibility, copy::getProfileApiVisibility,

                true);

        assertEqualGetterOrThrows(orig::areItemsRestrictedOnHomeScreen,

                copy::areItemsRestrictedOnHomeScreen, true);

    }



    /**

services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -350,8 +350,8 @@ public final class UserManagerTest { 
                privateProfileUserProperties::getAllowStoppingUserWithDelayedLocking);

        assertThat(typeProps.getProfileApiVisibility()).isEqualTo(

                privateProfileUserProperties.getProfileApiVisibility());

        assertThrows(SecurityException.class,

                privateProfileUserProperties::areItemsRestrictedOnHomeScreen);

        assertThat(typeProps.areItemsRestrictedOnHomeScreen())

                .isEqualTo(privateProfileUserProperties.areItemsRestrictedOnHomeScreen());

        compareDrawables(mUserManager.getUserBadge(),

                Resources.getSystem().getDrawable(userTypeDetails.getBadgePlain()));