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

Merge "Fix wrong targetSdkVersion returned by the ApkLiteParseUtils" into sc-dev am: 0d6cc194dc

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972859

Change-Id: Ib615b0300486da9b96cfbfc939b7bb19310076e0
This commit is contained in:
Rhed Jao
2021-06-16 07:50:33 +00:00
committed by Automerger Merge Worker
parent 9053769983 0d6cc194dc
commit 6d0557b9ae
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/parsing/ApkLiteParseUtils.java
View File

@@ -493,6 +493,7 @@ public class ApkLiteParseUtils {
if (targetResult.isError()) { if (targetResult.isError()) {
return input.error(targetResult); return input.error(targetResult);
} }
targetSdkVersion = targetResult.getResult();
ParseResult<Integer> minResult = ParsingPackageUtils.computeMinSdkVersion( ParseResult<Integer> minResult = ParsingPackageUtils.computeMinSdkVersion(
minVer, minCode, ParsingPackageUtils.SDK_VERSION, minVer, minCode, ParsingPackageUtils.SDK_VERSION,
@@ -500,8 +501,6 @@ public class ApkLiteParseUtils {
if (minResult.isError()) { if (minResult.isError()) {
return input.error(minResult); return input.error(minResult);
} }
targetSdkVersion = targetResult.getResult();
minSdkVersion = minResult.getResult(); minSdkVersion = minResult.getResult();
} }
} }