commit 4cce5d76df11179c663c215a0a521196c29fc0b9
author Marco Nelissen <marcone@google.com> Thu Sep 26 13:01:20 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 26 13:01:20 2013 -0700
tree 5ae13a06de9ca9b27b28dbcb7506296da54edbd9
parent 38622428e0a98c9cc2074e99ec3966fe4cfecb2b
parent 6e14f9bc9086edf1112ea5e7f5f010251b65f926

am 6e14f9bc: am 2c702990: Merge "Fix logic in fallback ringtone handling" into klp-dev

* commit '6e14f9bc9086edf1112ea5e7f5f010251b65f926':
  Fix logic in fallback ringtone handling

media/java/android/media/Ringtone.java

diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index c335e55..1283e9b 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -280,7 +280,7 @@
     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 @@
                 } catch (NotFoundException nfe) {
                     Log.e(TAG, "Fallback ringtone does not exist");
                 }
+            } else {
+                Log.w(TAG, "not playing fallback for " + mUri);
             }
         }
         return false;