Merge "Update the target SDK version to 30 in the NetworkStackIntegrationTest."
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 7a2a471..3842b50 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -72,6 +72,7 @@
platform_apis: true,
test_suites: ["device-tests"],
min_sdk_version: "29",
+ target_sdk_version: "30",
}
// Network stack next integration tests.
@@ -111,6 +112,7 @@
certificate: "networkstack",
platform_apis: true,
min_sdk_version: "29",
+ target_sdk_version: "30",
test_suites: ["device-tests", "mts"],
test_config: "AndroidTest_Coverage.xml",
defaults: ["NetworkStackIntegrationTestsJniDefaults"],
diff --git a/tests/integration/AndroidManifest.xml b/tests/integration/AndroidManifest.xml
index 12f5d7d..bfd3735 100644
--- a/tests/integration/AndroidManifest.xml
+++ b/tests/integration/AndroidManifest.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.networkstack.integrationtests"
android:sharedUserId="android.uid.networkstack">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
<!-- Note: do not add any privileged or signature permissions that are granted
to the network stack app. Otherwise, the test APK will install, but when the device is
diff --git a/tests/integration/AndroidManifest_coverage.xml b/tests/integration/AndroidManifest_coverage.xml
index 660e42d..fc91e59 100644
--- a/tests/integration/AndroidManifest_coverage.xml
+++ b/tests/integration/AndroidManifest_coverage.xml
@@ -16,7 +16,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.server.networkstack.coverage"
android:sharedUserId="android.uid.networkstack">
- <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
<!-- Note: do not add any privileged or signature permissions that are granted
to the network stack app. Otherwise, the test APK will install, but when the device is