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

Commit bd26f06e authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Change FrameworksVcnTests min_sdk_version to 30" into main am: dd0bb14d am: 77728801 

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



Change-Id: Ic9c04efbd2a84dbd8cff7e255c593ae004a1ab6a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fa5bdd1 77728801

tests/vcn/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ android_test { 
    // For access hidden connectivity methods in tests

    defaults: ["framework-connectivity-test-defaults"],



    // TODO: b/374174952 Use 36 after Android B finalization

    min_sdk_version: "35",

    // Tethering module is released in R so this test needs to be installable

    // on R

    min_sdk_version: "30",



    srcs: [

        "java/**/*.java",

tests/vcn/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.tests.vcn">

    <!-- TODO: b/374174952 Use 36 after Android B finalization -->

    <uses-sdk android:minSdkVersion="35" android:targetSdkVersion="35" />

    <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="35" />



    <application>

        <uses-library android:name="android.test.runner" />