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

[automerge] [RESTRICT AUTOMERGE][pm] still allow debuggable for system app downgrades 2p: 636cdf22b9

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

Bug: 267232653
Bug: 256202273
Change-Id: Iba1c01bf07da821a05d3439df54e811ccfdf4505
This commit is contained in:
Songchun Fan
2023-02-03 18:41:30 +00:00
committed by Presubmit Automerger Backend
parent d1e75ee902 636cdf22b9
commit 24ab5f29ba
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -26891,10 +26891,13 @@ public class PackageManagerService extends IPackageManager.Stub
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 {
checkDowngrade(dataOwnerPkg, pkgLite); checkDowngrade(dataOwnerPkg, pkgLite);
} catch (PackageManagerException e) { } catch (PackageManagerException e) {
String errorMsg = "System app: " + packageName + " cannot be downgraded to" String errorMsg = "System app: " + packageName
+ " cannot be downgraded to"
+ " older than its preloaded version on the system image. " + " older than its preloaded version on the system image. "
+ e.getMessage(); + e.getMessage();
Slog.w(TAG, errorMsg); Slog.w(TAG, errorMsg);
@@ -26903,6 +26906,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
} }
}
return PackageManager.INSTALL_SUCCEEDED; return PackageManager.INSTALL_SUCCEEDED;
} }