From 36c4470a204e0bae1a6792d98332bc2f30c06be7 Mon Sep 17 00:00:00 2001 From: Winson Date: Thu, 9 Apr 2020 13:48:45 -0700 Subject: [PATCH] Return actual failure to parse base APK This exposes errors directly, which mirrors what PackageParser used to do. Just a leftover TODO from the refactor. Bug: 153472626 Test: manual install broken APK and check the error is logged Change-Id: I06804ad7396196e28ce2177a671d4eef3958e1d6 --- .../java/android/content/pm/parsing/ParsingPackageUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java index c94d428f44750..6bd8b1d9d7c0e 100644 --- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java @@ -21,7 +21,6 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE; import static android.content.pm.PackageManager.FEATURE_WATCH; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_BAD_MANIFEST; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES; -import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_NOT_APK; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_ONLY_COREAPP_ALLOWED; import static android.content.pm.PackageManager.INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION; import static android.os.Build.VERSION_CODES.DONUT; @@ -253,10 +252,8 @@ public class ParsingPackageUtils { final File baseApk = new File(lite.baseCodePath); ParseResult result = parseBaseApk(input, baseApk, lite.codePath, assets, flags); - // TODO(b/135203078): Pass original error up? if (result.isError()) { - return input.error(INSTALL_PARSE_FAILED_NOT_APK, - "Failed to parse base APK: " + baseApk); + return input.error(result); } ParsingPackage pkg = result.getResult();