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

Commit 54749a90 authored by Peter Li's avatar Peter Li Committed by Automerger Merge Worker
Browse files

Merge "Disallow device admin package and protected packages to be reinstalled... 

Merge "Disallow device admin package and protected packages to be reinstalled as instant." into sc-dev am: b5d26f69 am: 1c656694

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



Change-Id: I8fc026ccf783fbdb8a37b1d110ea97651bbcff9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1368ea9 1c656694

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

+5 −1
Original line number Diff line number Diff line
@@ -16284,6 +16284,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                    (installFlags & PackageManager.INSTALL_INSTANT_APP) != 0;

            final boolean fullApp =

                    (installFlags & PackageManager.INSTALL_FULL_APP) != 0;

            final boolean isPackageDeviceAdmin = isPackageDeviceAdmin(packageName, userId);

            final boolean isProtectedPackage = mProtectedPackages != null

                    && mProtectedPackages.isPackageStateProtected(userId, packageName);















            // writer















            synchronized (mLock) {









@@ -16291,7 +16294,8 @@ public class PackageManagerService extends IPackageManager.Stub













                if (pkgSetting == null) {















                    return PackageManager.INSTALL_FAILED_INVALID_URI;















                }













                if (instantApp && (pkgSetting.isSystem() || isUpdatedSystemApp(pkgSetting))) {













                if (instantApp && (pkgSetting.isSystem() || isUpdatedSystemApp(pkgSetting)













                        || isPackageDeviceAdmin || isProtectedPackage)) {















                    return PackageManager.INSTALL_FAILED_INVALID_URI;















                }















                if (!canViewInstantApps(callingUid, UserHandle.getUserId(callingUid))) {