am ef059b03: am 3c8bbe24: Check that mRemotePlayer is not null before use (3e2cb07d) · Commits · e / os / android_frameworks_base

media/java/android/media/Ringtone.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -217,7 +217,7 @@ public class Ringtone {
		if (mAudioManager.getStreamVolume(mStreamType) != 0) {
		mLocalPlayer.start();
		}
		} else if (mAllowRemote) {
		} else if (mAllowRemote && (mRemotePlayer != null)) {
		final Uri canonicalUri = mUri.getCanonicalUri();
		try {
		mRemotePlayer.play(mRemoteToken, canonicalUri, mStreamType);
		@@ -239,7 +239,7 @@ public class Ringtone {
		public void stop() {
		if (mLocalPlayer != null) {
		destroyLocalPlayer();
		} else if (mAllowRemote) {
		} else if (mAllowRemote && (mRemotePlayer != null)) {
		try {
		mRemotePlayer.stop(mRemoteToken);
		} catch (RemoteException e) {
		@@ -264,7 +264,7 @@ public class Ringtone {
		public boolean isPlaying() {
		if (mLocalPlayer != null) {
		return mLocalPlayer.isPlaying();
		} else if (mAllowRemote) {
		} else if (mAllowRemote && (mRemotePlayer != null)) {
		try {
		return mRemotePlayer.isPlaying(mRemoteToken);
		} catch (RemoteException e) {