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

Commit e9799391 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] fail install-existing for apps deleted with KEEP_DATA" into... 

Merge "[pm] fail install-existing for apps deleted with KEEP_DATA" into udc-dev am: 5d8b0d27 am: 867adfb0

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



Change-Id: I8d7f8b6022229cbe25110b2ba49dc3fbe6648364
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f77f2253 867adfb0

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

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ final class DeletePackageHelper { 
                        // We need to set it back to 'installed' so the uninstall

                        // broadcasts will be sent correctly.

                        if (DEBUG_REMOVE) Slog.d(TAG, "Not installed by other users, full delete");

                        ps.setPkg(null);

                        ps.setInstalled(true, userId);

                        mPm.mSettings.writeKernelMappingLPr(ps);

                        clearPackageStateAndReturn = false;

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

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ final class InstallPackageHelper { 
            synchronized (mPm.mLock) {

                final Computer snapshot = mPm.snapshotComputer();

                pkgSetting = mPm.mSettings.getPackageLPr(packageName);

                if (pkgSetting == null) {

                if (pkgSetting == null || pkgSetting.getPkg() == null) {

                    return PackageManager.INSTALL_FAILED_INVALID_URI;

                }

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