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

Commit 2831d826 authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "[PM] Get the installer title via createPackageContextAsUser" into main

parents e8471f02 2e46fc6c

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

+3 −1
Original line number Diff line number Diff line
@@ -463,8 +463,10 @@ public class PackageArchiver { 
        final CompletableFuture<Void> archiveStateStored = new CompletableFuture<>();

        mPm.mHandler.post(() -> {

            try {

                final String installerTitle = getResponsibleInstallerTitle(

                        mContext, installerInfo, responsibleInstallerPackage, userId);

                var archiveState = createArchiveStateInternal(packageName, userId, mainActivities,

                        installerInfo.loadLabel(mContext.getPackageManager()).toString());

                        installerTitle);

                storeArchiveState(packageName, archiveState, userId);

                archiveStateStored.complete(null);

            } catch (IOException | PackageManager.NameNotFoundException e) {

services/tests/mockingservicestests/src/com/android/server/pm/PackageArchiverTest.java

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ public class PackageArchiverTest { 
        when(mContext.checkCallingOrSelfPermission(

                eq(Manifest.permission.REQUEST_DELETE_PACKAGES))).thenReturn(

                PackageManager.PERMISSION_DENIED);

        when(mContext.createPackageContextAsUser(

                eq(INSTALLER_PACKAGE), anyInt(), eq(UserHandle.CURRENT))).thenReturn(mContext);



        when(mAppOpsManager.checkOp(

                eq(AppOpsManager.OP_AUTO_REVOKE_PERMISSIONS_IF_UNUSED),