Revert "Verify the access to the mdnsd socket is blocked from Android U"
This reverts commit a7bc64ffcca1381f665be8ef8a9d179627b6165f.
Reason for revert: breaking tm-mainline-prod testsuit build
Change-Id: I38970fa9281f6f2e884e24680fccc86e269f6d7d
diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index f9fe5b0..23cb15c 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -114,39 +114,34 @@
],
}
-java_defaults {
- name: "CtsNetTestCasesMaxTargetSdkDefaults",
+android_test {
+ name: "CtsNetTestCasesMaxTargetSdk31", // Must match CtsNetTestCasesMaxTargetSdk31 annotation.
defaults: [
"CtsNetTestCasesDefaults",
"CtsNetTestCasesApiStableDefaults",
],
+ target_sdk_version: "31",
+ package_name: "android.net.cts.maxtargetsdk31", // CTS package names must be unique.
+ instrumentation_target_package: "android.net.cts.maxtargetsdk31",
test_suites: [
"cts",
"general-tests",
- "mts-tethering",
+ "mts-networking",
],
}
android_test {
- name: "CtsNetTestCasesMaxTargetSdk33", // Must match CtsNetTestCasesMaxTargetSdk33 annotation.
- defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
- target_sdk_version: "33",
- package_name: "android.net.cts.maxtargetsdk33",
- instrumentation_target_package: "android.net.cts.maxtargetsdk33",
-}
-
-android_test {
- name: "CtsNetTestCasesMaxTargetSdk31", // Must match CtsNetTestCasesMaxTargetSdk31 annotation.
- defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
- target_sdk_version: "31",
- package_name: "android.net.cts.maxtargetsdk31", // CTS package names must be unique.
- instrumentation_target_package: "android.net.cts.maxtargetsdk31",
-}
-
-android_test {
name: "CtsNetTestCasesMaxTargetSdk30", // Must match CtsNetTestCasesMaxTargetSdk30 annotation.
- defaults: ["CtsNetTestCasesMaxTargetSdkDefaults"],
+ defaults: [
+ "CtsNetTestCasesDefaults",
+ "CtsNetTestCasesApiStableDefaults",
+ ],
target_sdk_version: "30",
package_name: "android.net.cts.maxtargetsdk30", // CTS package names must be unique.
instrumentation_target_package: "android.net.cts.maxtargetsdk30",
+ test_suites: [
+ "cts",
+ "general-tests",
+ "mts-networking",
+ ],
}