| commit | 6f574c4d3a79c4b0e55b046003c531d1342330db | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri May 31 00:10:04 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 31 00:10:04 2019 +0000 |
| tree | 3d755f0943a2514bb306deaf2d7b348e7e183e3c | |
| parent | 1f915b0d3347404c6a2edca01c78294fe2351c6c [diff] | |
| parent | 5a7b1183a345599e967b567917534c7fc50c0bf2 [diff] |
Merge "video files with mimetype “video/x-ms-asf” can't scan to Gallery" into qt-dev
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index 710b503..0b1ae34 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java
@@ -220,7 +220,6 @@ case "audio/mpegurl": case "application/x-mpegurl": case "application/vnd.apple.mpegurl": - case "video/x-ms-asf": case "audio/x-scpls": return true; default: