am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev (0fa2a56c) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}