diff --git a/playback/player/android/AndroidManifest.xml b/playback/player/android/AndroidManifest.xml
index 8b156d49d0..41d56522a2 100644
--- a/playback/player/android/AndroidManifest.xml
+++ b/playback/player/android/AndroidManifest.xml
@@ -11,12 +11,7 @@
     <application android:label="@string/app_name">
         <activity android:name=".Play"
                   android:label="@string/app_name">
-            <!-- <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>-->
-
-            <!-- Local files whose MIME type is known to Android -->
+            <!-- Files whose MIME type is known to Android -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -26,9 +21,27 @@
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="video/*" />
                 <data android:mimeType="image/*" />
+                <data android:mimeType="*/rmvb" />
+                <data android:mimeType="*/avi" />
+                <data android:mimeType="*/mkv" />
+                <data android:mimeType="application/3gpp*" />
+                <data android:mimeType="application/mp4" />
+                <data android:mimeType="application/mpeg*" />
+                <data android:mimeType="application/ogg" />
+                <data android:mimeType="application/sdp" />
+                <data android:mimeType="application/vnd.3gp*" />
+                <data android:mimeType="application/vnd.apple.mpegurl" />
+                <data android:mimeType="application/vnd.rn-realmedia*" />
+                <data android:mimeType="application/x-iso9660-image" />
+                <data android:mimeType="application/x-extension-mp4" />
+                <data android:mimeType="application/x-flac" />
+                <data android:mimeType="application/x-matroska" />
+                <data android:mimeType="application/x-mpegURL" />
+                <data android:mimeType="application/x-ogg" />
+                <data android:mimeType="application/x-quicktimeplayer" />
             </intent-filter>
 
-            <!-- Local files with unknown MIME type.
+            <!-- Files with unknown MIME type.
                  The list of extensions and supported protocols can certainly be extended. -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -37,43 +50,299 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:scheme="file" />
-                <data android:mimeType="*/*" />
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+
+                <!-- video -->
+                <data android:pathPattern=".*\\.3g2" />
+                <data android:pathPattern=".*\\.3gp" />
+                <data android:pathPattern=".*\\.3gp2" />
+                <data android:pathPattern=".*\\.3gpp" />
+                <data android:pathPattern=".*\\.amv" />
+                <data android:pathPattern=".*\\.asf" />
                 <data android:pathPattern=".*\\.avi" />
-                <data android:pathPattern=".*\\.AVI" />
+                <data android:pathPattern=".*\\.divx" />
+                <data android:pathPattern=".*\\.drc" />
+                <data android:pathPattern=".*\\.dv" />
+                <data android:pathPattern=".*\\.f4v" />
+                <data android:pathPattern=".*\\.flv" />
+                <data android:pathPattern=".*\\.gvi" />
+                <data android:pathPattern=".*\\.gxf" />
+                <data android:pathPattern=".*\\.ismv" />
+                <data android:pathPattern=".*\\.iso" />
+                <data android:pathPattern=".*\\.m1v" />
+                <data android:pathPattern=".*\\.m2v" />
+                <data android:pathPattern=".*\\.m2t" />
+                <data android:pathPattern=".*\\.m2ts" />
+                <!-- <data android:pathPattern=".*\\.m3u" /> -->
+                <data android:pathPattern=".*\\.m3u8" />
                 <data android:pathPattern=".*\\.mkv" />
-                <data android:pathPattern=".*\\.MKV" />
-                <data android:pathPattern=".*\\.webm" />
-                <data android:pathPattern=".*\\.WEBM" />
-                <data android:pathPattern=".*\\.ogv" />
-                <data android:pathPattern=".*\\.OGV" />
-                <data android:pathPattern=".*\\.mp4" />
-                <data android:pathPattern=".*\\.MP4" />
                 <data android:pathPattern=".*\\.mov" />
+                <data android:pathPattern=".*\\.mp2" />
+                <data android:pathPattern=".*\\.mp2v" />
+                <data android:pathPattern=".*\\.mp4" />
+                <data android:pathPattern=".*\\.mp4v" />
+                <data android:pathPattern=".*\\.mpe" />
+                <data android:pathPattern=".*\\.mpeg" />
+                <data android:pathPattern=".*\\.mpeg1" />
+                <data android:pathPattern=".*\\.mpeg2" />
+                <data android:pathPattern=".*\\.mpeg4" />
+                <data android:pathPattern=".*\\.mpg" />
+                <data android:pathPattern=".*\\.mpv2" />
+                <data android:pathPattern=".*\\.mts" />
+                <data android:pathPattern=".*\\.mtv" />
+                <data android:pathPattern=".*\\.mxf" />
+                <data android:pathPattern=".*\\.mxg" />
+                <data android:pathPattern=".*\\.nsv" />
+                <data android:pathPattern=".*\\.nut" />
+                <data android:pathPattern=".*\\.nuv" />
+                <data android:pathPattern=".*\\.ogm" />
+                <data android:pathPattern=".*\\.ogv" />
+                <data android:pathPattern=".*\\.ogx" />
+                <data android:pathPattern=".*\\.ps" />
+                <data android:pathPattern=".*\\.rec" />
+                <data android:pathPattern=".*\\.rm" />
+                <data android:pathPattern=".*\\.rmvb" />
+                <data android:pathPattern=".*\\.tod" />
+                <data android:pathPattern=".*\\.ts" />
+                <data android:pathPattern=".*\\.tts" />
+                <data android:pathPattern=".*\\.vob" />
+                <data android:pathPattern=".*\\.vro" />
+                <data android:pathPattern=".*\\.webm" />
+                <data android:pathPattern=".*\\.wm" />
+                <data android:pathPattern=".*\\.wmv" />
+                <data android:pathPattern=".*\\.wtv" />
+                <data android:pathPattern=".*\\.xesc" />
+                <data android:pathPattern=".*\\.3G2" />
+                <data android:pathPattern=".*\\.3GP" />
+                <data android:pathPattern=".*\\.3GP2" />
+                <data android:pathPattern=".*\\.3GPP" />
+                <data android:pathPattern=".*\\.AMV" />
+                <data android:pathPattern=".*\\.ASF" />
+                <data android:pathPattern=".*\\.AVI" />
+                <data android:pathPattern=".*\\.DIVX" />
+                <data android:pathPattern=".*\\.DRC" />
+                <data android:pathPattern=".*\\.DV" />
+                <data android:pathPattern=".*\\.F4V" />
+                <data android:pathPattern=".*\\.FLV" />
+                <data android:pathPattern=".*\\.GVI" />
+                <data android:pathPattern=".*\\.GXF" />
+                <data android:pathPattern=".*\\.ISMV" />
+                <data android:pathPattern=".*\\.ISO" />
+                <data android:pathPattern=".*\\.M1V" />
+                <data android:pathPattern=".*\\.M2V" />
+                <data android:pathPattern=".*\\.M2T" />
+                <data android:pathPattern=".*\\.M2TS" />
+                <!-- <data android:pathPattern=".*\\.M3U" /> -->
+                <data android:pathPattern=".*\\.M3U8" />
+                <data android:pathPattern=".*\\.MKV" />
                 <data android:pathPattern=".*\\.MOV" />
+                <data android:pathPattern=".*\\.MP2" />
+                <data android:pathPattern=".*\\.MP2V" />
+                <data android:pathPattern=".*\\.MP4" />
+                <data android:pathPattern=".*\\.MP4V" />
+                <data android:pathPattern=".*\\.MPE" />
+                <data android:pathPattern=".*\\.MPEG" />
+                <data android:pathPattern=".*\\.MPEG1" />
+                <data android:pathPattern=".*\\.MPEG2" />
+                <data android:pathPattern=".*\\.MPEG4" />
+                <data android:pathPattern=".*\\.MPG" />
+                <data android:pathPattern=".*\\.MPV2" />
+                <data android:pathPattern=".*\\.MTS" />
+                <data android:pathPattern=".*\\.MTV" />
+                <data android:pathPattern=".*\\.MXF" />
+                <data android:pathPattern=".*\\.MXG" />
+                <data android:pathPattern=".*\\.NSV" />
+                <data android:pathPattern=".*\\.NUT" />
+                <data android:pathPattern=".*\\.NUV" />
+                <data android:pathPattern=".*\\.OGM" />
+                <data android:pathPattern=".*\\.OGV" />
+                <data android:pathPattern=".*\\.OGX" />
+                <data android:pathPattern=".*\\.PS" />
+                <data android:pathPattern=".*\\.REC" />
+                <data android:pathPattern=".*\\.RM" />
+                <data android:pathPattern=".*\\.RMVB" />
+                <data android:pathPattern=".*\\.TOD" />
+                <data android:pathPattern=".*\\.TS" />
+                <data android:pathPattern=".*\\.TTS" />
+                <data android:pathPattern=".*\\.VOB" />
+                <data android:pathPattern=".*\\.VRO" />
+                <data android:pathPattern=".*\\.WEBM" />
+                <data android:pathPattern=".*\\.WM" />
+                <data android:pathPattern=".*\\.WMV" />
+                <data android:pathPattern=".*\\.WTV" />
+                <data android:pathPattern=".*\\.XESC" />
+
+                <!-- audio -->
+
+                <data android:pathPattern=".*\\.3ga" />
+                <data android:pathPattern=".*\\.a52" />
+                <data android:pathPattern=".*\\.aac" />
+                <data android:pathPattern=".*\\.ac3" />
+                <data android:pathPattern=".*\\.adt" />
+                <data android:pathPattern=".*\\.adts" />
+                <data android:pathPattern=".*\\.aif" />
+                <data android:pathPattern=".*\\.aifc" />
+                <data android:pathPattern=".*\\.aiff" />
+                <data android:pathPattern=".*\\.amr" />
+                <data android:pathPattern=".*\\.aob" />
+                <data android:pathPattern=".*\\.ape" />
+                <data android:pathPattern=".*\\.awb" />
+                <data android:pathPattern=".*\\.caf" />
+                <data android:pathPattern=".*\\.dts" />
+                <data android:pathPattern=".*\\.flac" />
+                <data android:pathPattern=".*\\.it" />
+                <data android:pathPattern=".*\\.m4a" />
+                <data android:pathPattern=".*\\.m4b" />
+                <data android:pathPattern=".*\\.m4p" />
+                <data android:pathPattern=".*\\.mid" />
+                <data android:pathPattern=".*\\.mka" />
+                <data android:pathPattern=".*\\.mlp" />
+                <data android:pathPattern=".*\\.mod" />
+                <data android:pathPattern=".*\\.mpa" />
+                <data android:pathPattern=".*\\.mp1" />
+                <data android:pathPattern=".*\\.mp2" />
+                <data android:pathPattern=".*\\.mp3" />
+                <data android:pathPattern=".*\\.mpc" />
+                <data android:pathPattern=".*\\.mpga" />
+                <data android:pathPattern=".*\\.oga" />
+                <data android:pathPattern=".*\\.ogg" />
+                <data android:pathPattern=".*\\.oma" />
+                <data android:pathPattern=".*\\.opus" />
+                <data android:pathPattern=".*\\.ra" />
+                <data android:pathPattern=".*\\.ram" />
+                <data android:pathPattern=".*\\.rmi" />
+                <data android:pathPattern=".*\\.s3m" />
+                <data android:pathPattern=".*\\.spx" />
+                <data android:pathPattern=".*\\.tta" />
+                <data android:pathPattern=".*\\.voc" />
+                <data android:pathPattern=".*\\.vqf" />
+                <data android:pathPattern=".*\\.w64" />
+                <data android:pathPattern=".*\\.wav" />
+                <data android:pathPattern=".*\\.wma" />
+                <data android:pathPattern=".*\\.wv" />
+                <data android:pathPattern=".*\\.xa" />
+                <data android:pathPattern=".*\\.xm" />
+                <data android:pathPattern=".*\\.3GA" />
+                <data android:pathPattern=".*\\.A52" />
+                <data android:pathPattern=".*\\.AAC" />
+                <data android:pathPattern=".*\\.AC3" />
+                <data android:pathPattern=".*\\.ADT" />
+                <data android:pathPattern=".*\\.ADTS" />
+                <data android:pathPattern=".*\\.AIF" />
+                <data android:pathPattern=".*\\.AIFC" />
+                <data android:pathPattern=".*\\.AIFF" />
+                <data android:pathPattern=".*\\.AMR" />
+                <data android:pathPattern=".*\\.AOB" />
+                <data android:pathPattern=".*\\.APE" />
+                <data android:pathPattern=".*\\.AWB" />
+                <data android:pathPattern=".*\\.CAF" />
+                <data android:pathPattern=".*\\.DTS" />
+                <data android:pathPattern=".*\\.FLAC" />
+                <data android:pathPattern=".*\\.IT" />
+                <data android:pathPattern=".*\\.M4A" />
+                <data android:pathPattern=".*\\.M4B" />
+                <data android:pathPattern=".*\\.M4P" />
+                <data android:pathPattern=".*\\.MID" />
+                <data android:pathPattern=".*\\.MKA" />
+                <data android:pathPattern=".*\\.MLP" />
+                <data android:pathPattern=".*\\.MOD" />
+                <data android:pathPattern=".*\\.MPA" />
+                <data android:pathPattern=".*\\.MP1" />
+                <data android:pathPattern=".*\\.MP2" />
+                <data android:pathPattern=".*\\.MP3" />
+                <data android:pathPattern=".*\\.MPC" />
+                <data android:pathPattern=".*\\.MPGA" />
+                <data android:pathPattern=".*\\.OGA" />
+                <data android:pathPattern=".*\\.OGG" />
+                <data android:pathPattern=".*\\.OMA" />
+                <data android:pathPattern=".*\\.OPUS" />
+                <data android:pathPattern=".*\\.RA" />
+                <data android:pathPattern=".*\\.RAM" />
+                <data android:pathPattern=".*\\.RMI" />
+                <data android:pathPattern=".*\\.S3M" />
+                <data android:pathPattern=".*\\.SPX" />
+                <data android:pathPattern=".*\\.TTA" />
+                <data android:pathPattern=".*\\.VOC" />
+                <data android:pathPattern=".*\\.VQF" />
+                <data android:pathPattern=".*\\.W64" />
+                <data android:pathPattern=".*\\.WAV" />
+                <data android:pathPattern=".*\\.WMA" />
+                <data android:pathPattern=".*\\.WV" />
+                <data android:pathPattern=".*\\.XA" />
+                <data android:pathPattern=".*\\.XM" />
             </intent-filter>
 
-            <!-- Remote files. These typically have unknown MIME type.
-                 The list of extensions and supported protocols can certainly be extended. -->
+            <!-- Remote URI schemes without types -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="http" />
-                <data android:pathPattern=".*\\.avi" />
-                <data android:pathPattern=".*\\.AVI" />
-                <data android:pathPattern=".*\\.mkv" />
-                <data android:pathPattern=".*\\.MKV" />
-                <data android:pathPattern=".*\\.webm" />
-                <data android:pathPattern=".*\\.WEBM" />
-                <data android:pathPattern=".*\\.ogv" />
-                <data android:pathPattern=".*\\.OGV" />
-                <data android:pathPattern=".*\\.mp4" />
-                <data android:pathPattern=".*\\.MP4" />
-                <data android:pathPattern=".*\\.mov" />
-                <data android:pathPattern=".*\\.MOV" />
+                <data android:scheme="rtmp" />
+                <data android:scheme="rtmpt" />
+                <data android:scheme="rtmps" />
+                <data android:scheme="rtmpe" />
+                <data android:scheme="rtmfp" />
+                <data android:scheme="rtmpte" />
+                <data android:scheme="rtmpts" />
+                <data android:scheme="rtsp" />
+                <data android:scheme="rtspu" />
+                <data android:scheme="rtspt" />
+                <data android:scheme="rtsph" />
+                <data android:scheme="rtsp-sdp" />
+                <data android:scheme="rtsps" />
+                <data android:scheme="rtspsu" />
+                <data android:scheme="rtspst" />
+                <data android:scheme="rtspsh" />
+                <data android:scheme="mms" />
+                <data android:scheme="mmsh" />
+                <data android:scheme="mmst" />
+                <data android:scheme="mmsu" />
+                <data android:scheme="icy" />
+                <data android:scheme="icyx" />
+                <data android:scheme="udp" />
             </intent-filter>
+
+            <!-- Remote URI schemes with types -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:mimeType="audio/*" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="image/*" />
+
+                <data android:scheme="rtmp" />
+                <data android:scheme="rtmpt" />
+                <data android:scheme="rtmps" />
+                <data android:scheme="rtmpe" />
+                <data android:scheme="rtmfp" />
+                <data android:scheme="rtmpte" />
+                <data android:scheme="rtmpts" />
+                <data android:scheme="rtsp" />
+                <data android:scheme="rtspu" />
+                <data android:scheme="rtspt" />
+                <data android:scheme="rtsph" />
+                <data android:scheme="rtsp-sdp" />
+                <data android:scheme="rtsps" />
+                <data android:scheme="rtspsu" />
+                <data android:scheme="rtspst" />
+                <data android:scheme="rtspsh" />
+                <data android:scheme="mms" />
+                <data android:scheme="mmsh" />
+                <data android:scheme="mmst" />
+                <data android:scheme="mmsu" />
+                <data android:scheme="icy" />
+                <data android:scheme="icyx" />
+                <data android:scheme="udp" />
+            </intent-filter>
+
+
+
         </activity>
     </application>
 </manifest>