Merge "[pm] forbid deletion of protected packages" into tm-dev am: 12e837e3a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19929347 Change-Id: I1211e47dd0fef5309da889830a0630c96f033d6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -657,6 +657,18 @@ final class DeletePackageHelper {
|
|||||||
final String packageName = versionedPackage.getPackageName();
|
final String packageName = versionedPackage.getPackageName();
|
||||||
final long versionCode = versionedPackage.getLongVersionCode();
|
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 {
|
try {
|
||||||
if (mPm.mInjector.getLocalService(ActivityTaskManagerInternal.class)
|
if (mPm.mInjector.getLocalService(ActivityTaskManagerInternal.class)
|
||||||
.isBaseOfLockedTask(packageName)) {
|
.isBaseOfLockedTask(packageName)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user