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

Commit 34a55fcf authored by Songchun Fan's avatar Songchun Fan Committed by Automerger Merge Worker
Browse files

Merge "[pm] forbid deletion of protected packages" into tm-dev am: 12e837e3... 

Merge "[pm] forbid deletion of protected packages" into tm-dev am: 12e837e3 am: afb5d201 am: 689f4b13

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



Change-Id: I923ad3bba8c7cb73df8e00080426529ba33a28df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7a0edf2 689f4b13

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

+12 −0
Original line number Diff line number Diff line
@@ -657,6 +657,18 @@ final class DeletePackageHelper { 
        final String packageName = versionedPackage.getPackageName();

        final long versionCode = versionedPackage.getLongVersionCode();



        if (mPm.mProtectedPackages.isPackageDataProtected(userId, packageName)) {

            mPm.mHandler.post(() -> {

                try {

                    Slog.w(TAG, "Attempted to delete protected package: " + packageName);

                    observer.onPackageDeleted(packageName,

                            PackageManager.DELETE_FAILED_INTERNAL_ERROR, null);

                } catch (RemoteException re) {

                }

            });

            return;

        }



        try {

            if (mPm.mInjector.getLocalService(ActivityTaskManagerInternal.class)

                    .isBaseOfLockedTask(packageName)) {