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 am: dbd81bcbaf

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

Change-Id: I8db5e69813ab840738be7737b39e2783f3a4b29e
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:59:18 +00:00
committed by Automerger Merge Worker
parent 7ae054387a dbd81bcbaf
commit 8ea978006d
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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