[RESTRICT AUTOMERGE][pm] still allow debuggable for system app downgrades am: 14a91d2bc8 am: dbd81bcbaf am: 8ea978006d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21266935 Change-Id: Ibe3e160facc49fb7919ada0944f8561fabe32cdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user