From 7aeebcafadf63be9877a4b29e446fddd270e3daf Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 13 Dec 2019 15:13:03 -0800
Subject: Add FrameworksWifiApiTests to MTS

Bug: 146163587
Test: compiles
Change-Id: Id871be333e0216892e49adeb4a8080262439b6b9
---
 wifi/tests/Android.mk      | 4 +++-
 wifi/tests/AndroidTest.xml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wifi/tests/Android.mk b/wifi/tests/Android.mk
index 3453d6ec827f..d2c385b46eb1 100644
--- a/wifi/tests/Android.mk
+++ b/wifi/tests/Android.mk
@@ -59,6 +59,8 @@ LOCAL_JAVA_LIBRARIES := \
 
 LOCAL_PACKAGE_NAME := FrameworksWifiApiTests
 LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
+LOCAL_COMPATIBILITY_SUITE := \
+    device-tests \
+    mts \
 
 include $(BUILD_PACKAGE)
diff --git a/wifi/tests/AndroidTest.xml b/wifi/tests/AndroidTest.xml
index cae19e46c6af..987fee79fefd 100644
--- a/wifi/tests/AndroidTest.xml
+++ b/wifi/tests/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Runs Frameworks Wifi API Tests.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="FrameworksWifiApiTests.apk" />
     </target_preparer>
 
-- 
cgit v1.2.3-59-g8ed1b


From 094ba71ffb05cb66b2447891419e0cbf556823e0 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 13 Dec 2019 15:14:04 -0800
Subject: FrameworksWifiApiTests runtest.sh: do not run with root

`adb root` is unnecessary, remove.

Bug: 146163587
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ibcdca8e6557d7ff6d17c7dc97ad16466b6bdbf4d
---
 wifi/tests/runtests.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wifi/tests/runtests.sh b/wifi/tests/runtests.sh
index 7a0dfb08fcfe..4024371dd97d 100755
--- a/wifi/tests/runtests.sh
+++ b/wifi/tests/runtests.sh
@@ -16,7 +16,6 @@ $ANDROID_BUILD_TOP/build/soong/soong_ui.bash --make-mode MODULES-IN-frameworks-b
 
 set -x # print commands
 
-adb root
 adb wait-for-device
 
 TARGET_ARCH=$($ANDROID_BUILD_TOP/build/soong/soong_ui.bash --dumpvar-mode TARGET_ARCH)
-- 
cgit v1.2.3-59-g8ed1b