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

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

Change-Id: I60c7ad30715087275e0f37317b55068fce59930b
This commit is contained in:
Rhed Jao
2021-06-16 07:59:51 +00:00
committed by Automerger Merge Worker

View File

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