commit ddb22d4e54afe67eab6f6bcfa9d95039158aa7ab
author Hyundo Moon <hdmoon@google.com> Wed Jan 04 01:37:42 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 04 01:37:43 2017 +0000
tree 6ddee89e33c19fdd370d23d9c5e5a8fd5f1d1a27
parent d3f073510eea5a4202b2a37cdb22e19271ba18b2
parent d398dfa045055cb22b104a6f8d55ff706bc61ca0

Merge "Fix AssertionFailedError in MediaSessionCompatTest" into nyc-support-25.1-dev

media-compat/tests/AndroidManifest.xml

diff --git a/media-compat/tests/AndroidManifest.xml b/media-compat/tests/AndroidManifest.xml
index 00de2db..1216194 100644
--- a/media-compat/tests/AndroidManifest.xml
+++ b/media-compat/tests/AndroidManifest.xml
@@ -27,6 +27,11 @@
     <application android:supportsRtl="true">
         <uses-library android:name="android.test.runner"/>
         <activity android:name="android.support.v4.media.session.TestActivity" />
+        <receiver android:name="android.support.v4.media.session.MediaButtonReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
     </application>
 
     <instrumentation