From fedab0219cc5e29079492860d81602841b4aed06 Mon Sep 17 00:00:00 2001
From: Simran Basi <sbasi@google.com>
Date: Thu, 31 Aug 2017 10:54:06 -0700
Subject: [PATCH] Update Several Instrumentation AndroidTest files with the
 correct runner.

Updated the instrumentation runner for:
* FrameworksNotificationTests
* SystemUITests
* MtpDocumentsProvider

Bug: 65176822
Test: atest FrameworksNotificationTests
      atest SystemUITests
      atest MtpDocumentsProvider
Change-Id: I939d890715dce123bd77c5e352d0b01852ddd755
---
 packages/MtpDocumentsProvider/tests/AndroidTest.xml | 4 ++--
 packages/SystemUI/tests/AndroidTest.xml             | 2 +-
 services/tests/notification/AndroidTest.xml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/MtpDocumentsProvider/tests/AndroidTest.xml b/packages/MtpDocumentsProvider/tests/AndroidTest.xml
index d0b4c6efe2244..940d36465dbac 100644
--- a/packages/MtpDocumentsProvider/tests/AndroidTest.xml
+++ b/packages/MtpDocumentsProvider/tests/AndroidTest.xml
@@ -21,7 +21,7 @@
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="MtpDocumentsProviderTests" />
     <test class="com.android.tradefed.testtype.InstrumentationTest" >
-        <option name="package" value="com.android.mtp" />
-        <option name="runner" value="android.test.InstrumentationTestRunner" />
+        <option name="package" value="com.android.mtp.tests" />
+        <option name="runner" value="com.android.mtp.TestResultInstrumentation" />
     </test>
 </configuration>
diff --git a/packages/SystemUI/tests/AndroidTest.xml b/packages/SystemUI/tests/AndroidTest.xml
index 6ca42e8c3fccf..53839a9bf56b6 100644
--- a/packages/SystemUI/tests/AndroidTest.xml
+++ b/packages/SystemUI/tests/AndroidTest.xml
@@ -23,6 +23,6 @@
     <option name="test-tag" value="SystemUITests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.systemui.tests" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="runner" value="android.testing.TestableInstrumentation" />
     </test>
 </configuration>
diff --git a/services/tests/notification/AndroidTest.xml b/services/tests/notification/AndroidTest.xml
index fa77407262b8f..448bc3de5a0eb 100644
--- a/services/tests/notification/AndroidTest.xml
+++ b/services/tests/notification/AndroidTest.xml
@@ -23,6 +23,6 @@
     <option name="test-tag" value="FrameworksNotificationTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.frameworks.tests.notification" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="runner" value="android.testing.TestableInstrumentation" />
     </test>
 </configuration>