Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev (1102e712) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ import java.io.ByteArrayOutputStream;
		import java.io.File;
		import java.io.FileDescriptor;
		import java.io.FileInputStream;
		import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		@@ -979,6 +980,9 @@ public class MediaPlayer implements SubtitleController.Listener
		// Redirect ringtones to go directly to underlying provider
		uri = RingtoneManager.getActualDefaultRingtoneUri(context,
		RingtoneManager.getDefaultType(uri));
		if (uri == null) {
		throw new FileNotFoundException("Failed to resolve default ringtone");
		}
		}

		AssetFileDescriptor fd = null;

+7 −6

Original line number	Diff line number	Diff line
		@@ -51,6 +51,12 @@ public class Ringtone {

		private final Context mContext;
		private final AudioManager mAudioManager;

		/**
		* Flag indicating if we're allowed to fall back to remote playback using
		* {@link #mRemotePlayer}. Typically this is false when we're the remote
		* player and there is nobody else to delegate to.
		*/
		private final boolean mAllowRemote;
		private final IRingtonePlayer mRemotePlayer;
		private final Binder mRemoteToken;
		@@ -211,12 +217,7 @@ public class Ringtone {
		mLocalPlayer.setAudioAttributes(mAudioAttributes);
		mLocalPlayer.prepare();

		} catch (SecurityException e) {
		destroyLocalPlayer();
		if (!mAllowRemote) {
		Log.w(TAG, "Remote playback not allowed: " + e);
		}
		} catch (IOException e) {
		} catch (SecurityException \| IOException e) {
		destroyLocalPlayer();
		if (!mAllowRemote) {
		Log.w(TAG, "Remote playback not allowed: " + e);