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>
diff --git a/tests/vcn/Android.bp b/tests/vcn/Android.bp
index 661ed07..5ad1d1dc 100644
--- a/tests/vcn/Android.bp
+++ b/tests/vcn/Android.bp
@@ -17,8 +17,9 @@
// 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 08effbd..6e8b4ac 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" />