From 6ec6b189601229436375c986296a93e75b4f662e Mon Sep 17 00:00:00 2001
From: Winson Chiu <chiuwinson@google.com>
Date: Thu, 3 Jun 2021 17:35:06 +0000
Subject: [PATCH] Fix OverlayConfigTest minSdkVersion

With a fix to ApkLite parsing, targetSdk gets coerced to a minimum
of the minSdkVersion. And by default the build system sets the min to
the dev version, so the target would be brought up to 10000.

The test expects 21, so make the min just below that at 20.

Bug: 189988918

Test: atest com.android.internal.content.OverlayConfigTest

Change-Id: Iec7af27012c207e8cc888b6d16fc71e5e47bc73a
---
 core/tests/coretests/apks/overlay_config/Android.bp          | 1 +
 core/tests/coretests/apks/overlay_config/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/tests/coretests/apks/overlay_config/Android.bp b/core/tests/coretests/apks/overlay_config/Android.bp
index 9c971fd2f1bc7..07775239d6ed4 100644
--- a/core/tests/coretests/apks/overlay_config/Android.bp
+++ b/core/tests/coretests/apks/overlay_config/Android.bp
@@ -10,4 +10,5 @@ package {
 android_test_helper_app {
     name: "FrameworksCoreTests_overlay_config",
     defaults: ["FrameworksCoreTests_apks_defaults"],
+    min_sdk_version: "20",
 }
diff --git a/core/tests/coretests/apks/overlay_config/AndroidManifest.xml b/core/tests/coretests/apks/overlay_config/AndroidManifest.xml
index b15338eb545ba..092a5754286f7 100644
--- a/core/tests/coretests/apks/overlay_config/AndroidManifest.xml
+++ b/core/tests/coretests/apks/overlay_config/AndroidManifest.xml
@@ -19,7 +19,7 @@
 
     <application android:hasCode="false" />
 
-    <uses-sdk android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="20" android:targetSdkVersion="21"/>
 
     <overlay android:targetPackage="android"
              android:targetName="TestResources" />