drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Open file:// Uris on client side of MediaPlayer."

Browse Source
This commit is contained in:
Jeff Sharkey
2013-02-19 23:12:03 +00:00
committed by Android (Google) Code Review
parent 5b0324299a c058a380de
commit 81aaf87d09
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/java/android/media/MediaPlayer.java
View File

@ -948,7 +948,12 @@ public class MediaPlayer
private void setDataSource(String path, String[] keys, String[] values) private void setDataSource(String path, String[] keys, String[] values)
throws IOException, IllegalArgumentException, SecurityException, IllegalStateException { throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
File file = new File(path); final Uri uri = Uri.parse(path);
if ("file".equals(uri.getScheme())) {
path = uri.getPath();
}
final File file = new File(path);
if (file.exists()) { if (file.exists()) {
FileInputStream is = new FileInputStream(file); FileInputStream is = new FileInputStream(file);
FileDescriptor fd = is.getFD(); FileDescriptor fd = is.getFD();