Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev

Browse Source 
* commit 'f14e4435e02c1cf058d475a389abae3000562190':
  Better logging of MediaPlayer failure reason.
This commit is contained in:
Jeff Sharkey
2015-07-20 19:11:17 +00:00
committed by Android Git Automerger
parent 498985e05f f14e4435e0
commit 37a8e0e0ae
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1017,16 +1017,14 @@ public class MediaPlayer implements SubtitleController.Listener
setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getDeclaredLength());
}
return;
} catch (SecurityException ex) {
} catch (IOException ex) {
} catch (SecurityException | IOException ex) {
Log.w(TAG, "Couldn't open file on client side; trying server side: " + ex);
} finally {
if (fd != null) {
fd.close();
}
}
Log.d(TAG, "Couldn't open file on client side, trying server side");
setDataSource(uri.toString(), headers);
}