am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev (4cce5d76) · Commits · e / os / android_frameworks_base

media/java/android/media/Ringtone.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -280,7 +280,7 @@ public class Ringtone {
		private boolean playFallbackRingtone() {
		if (mAudioManager.getStreamVolume(mStreamType) != 0) {
		int ringtoneType = RingtoneManager.getDefaultType(mUri);
		if (ringtoneType != -1 &&
		if (ringtoneType == -1 \|\|
		RingtoneManager.getActualDefaultRingtoneUri(mContext, ringtoneType) != null) {
		// Default ringtone, try fallback ringtone.
		try {
		@@ -309,6 +309,8 @@ public class Ringtone {
		} catch (NotFoundException nfe) {
		Log.e(TAG, "Fallback ringtone does not exist");
		}
		} else {
		Log.w(TAG, "not playing fallback for " + mUri);
		}
		}
		return false;