From ed6fae1d60892efb0c01ab1dedf7c280124bd761 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 8 May 2020 20:13:21 +0000
Subject: Revert "opt/net/wifi/tests: Run mts-wifi on AOSP builds"

Revert submission 10814415-mts-wifi-com-androi-wifi

Reason for revert: Workaround no longer necessary: b/152559881#comment2
Reverted Changes:
I11baae67e:frameworks/base/wifi/tests: Run mts-wifi on AOSP b...
I66febcbb2:opt/net/wifi/tests: Run mts-wifi on AOSP builds

Bug: 152559881
Test: in continuous runs
Change-Id: I0a6dbef4588319f0ce86415ed86fb939a5fde232
---
 tests/mts/AndroidTest.xml       | 4 ----
 tests/wifitests/AndroidTest.xml | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/tests/mts/AndroidTest.xml b/tests/mts/AndroidTest.xml
index 1e9266c09..ee5878600 100644
--- a/tests/mts/AndroidTest.xml
+++ b/tests/mts/AndroidTest.xml
@@ -36,9 +36,5 @@
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.wifi" />
-        <!-- TODO(b/151836001): com.android.wifi doesn't guarantee it is a Mainline module since
-              it could still be OEM customized. Workaround so that this test will still run on
-              AOSP builds. -->
-        <option name="mainline-module-package-name" value="com.android.wifi" />
     </object>
 </configuration>
diff --git a/tests/wifitests/AndroidTest.xml b/tests/wifitests/AndroidTest.xml
index d55123ddc..f904a4436 100644
--- a/tests/wifitests/AndroidTest.xml
+++ b/tests/wifitests/AndroidTest.xml
@@ -30,9 +30,5 @@
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.wifi" />
-        <!-- TODO(b/151836001): com.android.wifi doesn't guarantee it is a Mainline module since
-              it could still be OEM customized. Workaround so that this test will still run on
-              AOSP builds. -->
-        <option name="mainline-module-package-name" value="com.android.wifi" />
     </object>
 </configuration>
-- 
cgit v1.2.3