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

Commit 870c0fe4 authored by Songchun Fan's avatar Songchun Fan Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev 

* changes:
  [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb5
  [pm] forbid deletion of protected packages
parents 582d8e02 989782a0

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -21359,6 +21359,20 @@ public class PackageManagerService extends IPackageManager.Stub 
















        final String packageName = versionedPackage.getPackageName();







        final String packageName = versionedPackage.getPackageName();











        final long versionCode = versionedPackage.getLongVersionCode();







        final long versionCode = versionedPackage.getLongVersionCode();



























        if (mProtectedPackages.isPackageStateProtected(userId, packageName)) {














            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;














        }





































        final String internalPackageName;







        final String internalPackageName;



























        try {







        try {