Merge "Better logging of MediaPlayer failure reason." into mnc-dev

This commit is contained in:
Jeff Sharkey
2015-07-20 17:37:06 +00:00
committed by Android (Google) Code Review

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);
}