[RESTRICT AUTOMERGE][pm] still allow debuggable for system app downgrades am: 14a91d2bc8
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:
@@ -2473,15 +2473,19 @@ final class InstallPackageHelper {
|
|||||||
if (disabledPs != null) {
|
if (disabledPs != null) {
|
||||||
dataOwnerPkg = disabledPs.getPkg();
|
dataOwnerPkg = disabledPs.getPkg();
|
||||||
}
|
}
|
||||||
try {
|
if (!Build.IS_DEBUGGABLE && !dataOwnerPkg.isDebuggable()) {
|
||||||
PackageManagerServiceUtils.checkDowngrade(dataOwnerPkg, pkgLite);
|
// Only restrict non-debuggable builds and non-debuggable version of the app
|
||||||
} catch (PackageManagerException e) {
|
try {
|
||||||
String errorMsg = "System app: " + packageName + " cannot be downgraded to"
|
PackageManagerServiceUtils.checkDowngrade(dataOwnerPkg, pkgLite);
|
||||||
+ " older than its preloaded version on the system image. "
|
} catch (PackageManagerException e) {
|
||||||
+ e.getMessage();
|
String errorMsg =
|
||||||
Slog.w(TAG, errorMsg);
|
"System app: " + packageName + " cannot be downgraded to"
|
||||||
return Pair.create(
|
+ " older than its preloaded version on the system"
|
||||||
PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg);
|
+ " image. " + e.getMessage();
|
||||||
|
Slog.w(TAG, errorMsg);
|
||||||
|
return Pair.create(
|
||||||
|
PackageManager.INSTALL_FAILED_VERSION_DOWNGRADE, errorMsg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user