Merge tag 'android-8.1.0_r29' into oreo-x86

Android 8.1.0 Release 29 (OPM4.171019.016.C1)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0263e6d..0d17236 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,14 +64,9 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="video/mpeg4" />
-                <data android:mimeType="video/mp4" />
-                <data android:mimeType="video/3gp" />
-                <data android:mimeType="video/3gpp" />
-                <data android:mimeType="video/3gpp2" />
-                <data android:mimeType="video/webm" />
-                <data android:mimeType="video/avi" />
+                <data android:mimeType="video/*" />
                 <data android:mimeType="application/sdp" />
+                <data android:mimeType="application/x-shockwave-flash" />
              </intent-filter>
              <intent-filter>
                 <!-- HTTP live support -->