diff options
| author | 2025-02-21 16:08:59 -0800 | |
|---|---|---|
| committer | 2025-02-21 16:08:59 -0800 | |
| commit | bd26f06e02c735e5f1b5d3aabacd6b1e9cfec441 (patch) | |
| tree | b10376dca8f13f1d11b9f89cc3c718d8dae09baf | |
| parent | 6fa5bdd136f09fba0d8eaf8f9f0e62b4a790728f (diff) | |
| parent | 77728801de0ab649908046618eb68e000ef3950b (diff) | |
Merge "Change FrameworksVcnTests min_sdk_version to 30" into main am: dd0bb14d3b am: 77728801de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3503058
Change-Id: Ic9c04efbd2a84dbd8cff7e255c593ae004a1ab6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/vcn/Android.bp | 5 | ||||
| -rw-r--r-- | tests/vcn/AndroidManifest.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/vcn/Android.bp b/tests/vcn/Android.bp index 661ed07a5669..5ad1d1dce324 100644 --- a/tests/vcn/Android.bp +++ b/tests/vcn/Android.bp @@ -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", diff --git a/tests/vcn/AndroidManifest.xml b/tests/vcn/AndroidManifest.xml index 08effbd1f7cf..6e8b4ac48816 100644 --- a/tests/vcn/AndroidManifest.xml +++ b/tests/vcn/AndroidManifest.xml @@ -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" /> |