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

Commit 1c656694 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

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



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

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

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

                    (installFlags & PackageManager.INSTALL_INSTANT_APP) != 0;

            final boolean fullApp =

            final boolean fullApp =

                    (installFlags & PackageManager.INSTALL_FULL_APP) != 0;

                    (installFlags & PackageManager.INSTALL_FULL_APP) != 0;

            final boolean isPackageDeviceAdmin = isPackageDeviceAdmin(packageName, userId);

            final boolean isProtectedPackage = mProtectedPackages != null

                    && mProtectedPackages.isPackageStateProtected(userId, packageName);

















            // writer







            // writer











            synchronized (mLock) {







            synchronized (mLock) {









@@ -16296,7 +16299,8 @@ public class PackageManagerService extends IPackageManager.Stub









                if (pkgSetting == null) {







                if (pkgSetting == null) {











                    return PackageManager.INSTALL_FAILED_INVALID_URI;







                    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;







                    return PackageManager.INSTALL_FAILED_INVALID_URI;











                }







                }











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







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