Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return actual failure to parse base APK" into rvc-dev am: fd09fe5cea am: a8452260a6

Browse Source 
Change-Id: I2fa9c71d0d88bda0f84c302b9f32f26099a7e205
This commit is contained in:
TreeHugger Robot
2020-04-10 16:16:28 +00:00
committed by Automerger Merge Worker
parent 8fb650daa3 a8452260a6
commit 23459c24b6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/parsing/ParsingPackageUtils.java
View File

@@ -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<ParsingPackage> 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();