From 5294b6b745be67acaf12219c6129c3eb93007768 Mon Sep 17 00:00:00 2001
From: Rhed Jao <rhedjao@google.com>
Date: Tue, 15 Jun 2021 15:44:35 +0800
Subject: [PATCH] Fix wrong targetSdkVersion returned by the ApkLiteParseUtils

Tests failed due to wrong targetSdkVersion returned by the apk lite
parser. The result of targetSdkVersion was overwritten by the
ParsingPackageUtils#computeMinSdkVersion.

Bug: 191063347
Test: atest SilentUpdateTests
Change-Id: If24d2c0eac10922903c5ca86d1b8ec8360d92e12
---
 core/java/android/content/pm/parsing/ApkLiteParseUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java
index 1e650a807cec6..154d9234d00ca 100644
--- a/core/java/android/content/pm/parsing/ApkLiteParseUtils.java
+++ b/core/java/android/content/pm/parsing/ApkLiteParseUtils.java
@@ -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();
             }
         }