Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RESTRICT AUTOMERGE][pm] still allow debuggable for system app downgrades am: 14a91d2bc8

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

Change-Id: I08029f10a512705bbed29653c7dbfdb503b10f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Songchun Fan
2023-02-03 20:33:17 +00:00
committed by Automerger Merge Worker
parent 9fff87e497 14a91d2bc8
commit dbd81bcbaf
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -2473,12 +2473,15 @@ final class InstallPackageHelper {
if (disabledPs != null) { if (disabledPs != null) {
dataOwnerPkg = disabledPs.getPkg(); dataOwnerPkg = disabledPs.getPkg();
} }
if (!Build.IS_DEBUGGABLE && !dataOwnerPkg.isDebuggable()) {
// Only restrict non-debuggable builds and non-debuggable version of the app
try { try {
PackageManagerServiceUtils.checkDowngrade(dataOwnerPkg, pkgLite); PackageManagerServiceUtils.checkDowngrade(dataOwnerPkg, pkgLite);
} catch (PackageManagerException e) { } catch (PackageManagerException e) {
String errorMsg = "System app: " + packageName + " cannot be downgraded to" String errorMsg =
+ " older than its preloaded version on the system image. " "System app: " + packageName + " cannot be downgraded to"
+ e.getMessage(); + " older than its preloaded version on the system"
+ " image. " + e.getMessage();
Slog.w(TAG, errorMsg); Slog.w(TAG, errorMsg);
return Pair.create( return Pair.create(
PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg); PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg);
@@ -2486,6 +2489,7 @@ final class InstallPackageHelper {
} }
} }
} }
}
return Pair.create(PackageManager.INSTALL_SUCCEEDED, null); return Pair.create(PackageManager.INSTALL_SUCCEEDED, null);
} }