From 4184d6bc5fb33254dfb67be4cfe15a88b6f98218 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Fri, 13 Dec 2019 15:16:50 -0800
Subject: Add FrameworksWifiTests to MTS

Bug: 146163587
Test: compiles
Change-Id: Ib383241b467134bd50763a0c0d389edc5ec9696c
---
 tests/wifitests/Android.bp      | 5 ++++-
 tests/wifitests/AndroidTest.xml | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/wifitests/Android.bp b/tests/wifitests/Android.bp
index 8d599c9da..fa436bd35 100644
--- a/tests/wifitests/Android.bp
+++ b/tests/wifitests/Android.bp
@@ -101,7 +101,10 @@ android_test {
     min_sdk_version: "29",
     platform_apis: true,
     privileged: true,
-    test_suites: ["device-tests"],
+    test_suites: [
+        "device-tests",
+        "mts",
+    ],
 
     // For coverage
     jacoco: {
diff --git a/tests/wifitests/AndroidTest.xml b/tests/wifitests/AndroidTest.xml
index 9fea86694..d9f363449 100644
--- a/tests/wifitests/AndroidTest.xml
+++ b/tests/wifitests/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Runs Frameworks Wifi Tests.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="FrameworksWifiTests.apk" />
     </target_preparer>
 
-- 
cgit v1.2.3