Merge "[pm] still allow debuggable for system app downgrades" (b867c1e9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/InstallPackageHelper.java

+13 −9

Original line number	Diff line number	Diff line
		@@ -2570,12 +2570,15 @@ final class InstallPackageHelper {
		if (disabledPs != null) {
		dataOwnerPkg = disabledPs.getPkg();
		}
		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();
		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);
		@@ -2583,6 +2586,7 @@ final class InstallPackageHelper {
		}
		}
		}
		}
		return Pair.create(PackageManager.INSTALL_SUCCEEDED, null);
		}