[RESTRICT AUTOMERGE][pm] still allow debuggable for system app downgrades
Turns out we do have internal tests that downgrades system apps, so adding this exception to allow for that.
BUG: 267232653
BUG: 256202273
Test: manual
Change-Id: Ie281bbdc8788ee64ff99a7c5150da7ce7926235e
(cherry picked from commit ceeca68b8c)
This commit is contained in:
committed by
Song Chun Fan
parent
858113a72b
commit
b050c4ba02
@@ -15029,15 +15029,19 @@ public class PackageManagerService extends IPackageManager.Stub
|
||||
if (disabledPs != null) {
|
||||
dataOwnerPkg = disabledPs.pkg;
|
||||
}
|
||||
try {
|
||||
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 PackageHelper.RECOMMEND_FAILED_VERSION_DOWNGRADE;
|
||||
if (!Build.IS_DEBUGGABLE && !dataOwnerPkg.isDebuggable()) {
|
||||
// Only restrict non-debuggable builds and non-debuggable version of
|
||||
// the app
|
||||
try {
|
||||
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 PackageHelper.RECOMMEND_FAILED_VERSION_DOWNGRADE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user