commit 655ef339469d5115fe3f60e776c83fc2865ca682
author Yuyang Huang <yuyanghuang@google.com> Fri Feb 17 02:59:39 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 17 02:59:39 2023 +0000
tree 63e68bcdcc43241fb5a4d4b29f78b1bbd4177a10
parent 7cdfc9099f45deddd189220b46a92f190bc68a56

Revert "Verify the access to the mdnsd socket is blocked from Android U"

This reverts commit 7cdfc9099f45deddd189220b46a92f190bc68a56.

Reason for revert: b/269587343

Change-Id: I8e0fbc7148b14d0df60ecd51cfd83f93986594d1

tests/cts/net/Android.bp

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",
+    ],
 }