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

Commit c1179c54 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Allow profiles of an admin user to remove system app updates." into... 

Merge "Allow profiles of an admin user to remove system app updates." into tm-dev am: 86445022 am: 25c6efe7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185142



Change-Id: I4be38e705a499ed39ddf091856dbe247f1b7b7f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87379351 25c6efe7

services/core/java/com/android/server/pm/DeletePackageHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -165,9 +165,10 @@ final class DeletePackageHelper { 


            if (PackageManagerServiceUtils.isSystemApp(uninstalledPs)) {

                UserInfo userInfo = mUserManagerInternal.getUserInfo(userId);

                if (userInfo == null || !userInfo.isAdmin()) {

                if (userInfo == null || (!userInfo.isAdmin() && !mUserManagerInternal.getUserInfo(

                        mUserManagerInternal.getProfileParentId(userId)).isAdmin())) {

                    Slog.w(TAG, "Not removing package " + packageName

                            + " as only admin user may downgrade system apps");

                            + " as only admin user (or their profile) may downgrade system apps");

                    EventLog.writeEvent(0x534e4554, "170646036", -1, packageName);

                    return PackageManager.DELETE_FAILED_USER_RESTRICTED;

                }

services/tests/mockingservicestests/src/com/android/server/pm/DeletePackageHelperTest.kt

+42 −2
Original line number Diff line number Diff line
@@ -68,13 +68,34 @@ class DeletePackageHelperTest { 
    }



    @Test

    fun deleteSystemPackageFailsIfNotAdmin() {

    fun deleteSystemPackageFailsIfNotAdminAndNotProfile() {

        val ps = mPms.mSettings.getPackageLPr("a.data.package")

        whenever(PackageManagerServiceUtils.isSystemApp(ps)).thenReturn(true)

        whenever(mUserManagerInternal.getUserInfo(1)).thenReturn(UserInfo(1, "test", 0))

        whenever(mUserManagerInternal.getProfileParentId(1)).thenReturn(1)



        val dph = DeletePackageHelper(mPms)

        val result = dph.deletePackageX("a.data.package", 1L, 1, 0, false)

        val result = dph.deletePackageX("a.data.package", 1L, 1,

            PackageManager.DELETE_SYSTEM_APP, false)



        assertThat(result).isEqualTo(PackageManager.DELETE_FAILED_USER_RESTRICTED)

    }



    @Test

    fun deleteSystemPackageFailsIfProfileOfNonAdmin() {

        val userId = 1

        val parentId = 5

        val ps = mPms.mSettings.getPackageLPr("a.data.package")

        whenever(PackageManagerServiceUtils.isSystemApp(ps)).thenReturn(true)

        whenever(mUserManagerInternal.getUserInfo(userId)).thenReturn(

            UserInfo(userId, "test", UserInfo.FLAG_PROFILE))

        whenever(mUserManagerInternal.getProfileParentId(userId)).thenReturn(parentId)

        whenever(mUserManagerInternal.getUserInfo(parentId)).thenReturn(

            UserInfo(userId, "testparent", 0))



        val dph = DeletePackageHelper(mPms)

        val result = dph.deletePackageX("a.data.package", 1L, userId,

            PackageManager.DELETE_SYSTEM_APP, false)



        assertThat(result).isEqualTo(PackageManager.DELETE_FAILED_USER_RESTRICTED)

    }
@@ -92,4 +113,23 @@ class DeletePackageHelperTest { 


        assertThat(result).isEqualTo(PackageManager.DELETE_SUCCEEDED)

    }



    @Test

    fun deleteSystemPackageSucceedsIfProfileOfAdmin() {

        val userId = 1

        val parentId = 5

        val ps = mPms.mSettings.getPackageLPr("a.data.package")

        whenever(PackageManagerServiceUtils.isSystemApp(ps)).thenReturn(true)

        whenever(mUserManagerInternal.getUserInfo(userId)).thenReturn(

            UserInfo(userId, "test", UserInfo.FLAG_PROFILE))

        whenever(mUserManagerInternal.getProfileParentId(userId)).thenReturn(parentId)

        whenever(mUserManagerInternal.getUserInfo(parentId)).thenReturn(

            UserInfo(userId, "testparent", UserInfo.FLAG_ADMIN))



        val dph = DeletePackageHelper(mPms)

        val result = dph.deletePackageX("a.data.package", 1L, userId,

            PackageManager.DELETE_SYSTEM_APP, false)



        assertThat(result).isEqualTo(PackageManager.DELETE_SUCCEEDED)

    }

}
 
 No newline at end of file