commit 0261708bf17cb0469de8eb3c81455e2f48ff9433
author Jaewan Kim <jaewan@google.com> Mon Feb 05 15:44:20 2018 +0900
committer Jaewan Kim <jaewan@google.com> Mon Feb 05 17:30:01 2018 +0900
tree e7dc790cfc44daff6519356e0ba6d90eebbf5e95
parent 479f0113471664c23b0258eddef2f1128ffc3010

MediaSession2: Send session info when a controller is connected

Bug: 72547163
Test: Run all tests once
Change-Id: I55730536cce6a938f8117abb433b492ac8e36bfc

packages/MediaComponents/test/AndroidManifest.xml

diff --git a/packages/MediaComponents/test/AndroidManifest.xml b/packages/MediaComponents/test/AndroidManifest.xml
index 30bac87..48e4292 100644
--- a/packages/MediaComponents/test/AndroidManifest.xml
+++ b/packages/MediaComponents/test/AndroidManifest.xml
@@ -20,14 +20,7 @@
     <application android:label="Media API Test">
         <uses-library android:name="android.test.runner" />
 
-        <activity android:name="android.widget2.VideoView2TestActivity"
-                  android:configChanges="keyboardHidden|orientation|screenSize"
-                  android:label="VideoView2TestActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
-            </intent-filter>
-          </activity>
+        <activity android:name="android.media.MockActivity" />
 
         <!-- Keep the test services synced together with the TestUtils.java -->
         <service android:name="android.media.MockMediaSessionService2">