Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a74e547 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Fix OverlayConfigTest minSdkVersion" into sc-dev am: feb4aed5 am: 3b637a95 

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

Change-Id: Id5db5637c3edd3515fa2f32ddccb8ee9ad277e1b
parents 7f319e86 3b637a95

core/tests/coretests/apks/overlay_config/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ package { 
android_test_helper_app {

    name: "FrameworksCoreTests_overlay_config",

    defaults: ["FrameworksCoreTests_apks_defaults"],

    min_sdk_version: "20",

}

core/tests/coretests/apks/overlay_config/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />