Merge "Fix OverlayConfigTest minSdkVersion" into sc-dev am: feb4aed5a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14813127 Change-Id: Ide0ce103a3ae00678f05e7f64ea17bbb1689ec55
2021-06-07 23:50:33 +00:00
parent afebf0225e feb4aed5a8
commit 06ab21f284
2 changed files with 2 additions and 1 deletions
--- 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",
 }
--- 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" />