diff options
| author | Marco Nelissen <marcone@google.com> | 2013-09-26 19:56:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-26 19:56:13 +0000 |
| commit | 2c7029902961772a1531b6502e4fb45a3e6fb76f (patch) | |
| tree | 3a94205444fa9207ba870243969a6f16db7f901f /media | |
| parent | 9f54a5834a5dacbf742ae17a63d7e5e290b6ccb3 (diff) | |
| parent | 19a4671b10e7d07309f1d427e1d81b87d5bbca18 (diff) | |
| download | frameworks_base-2c7029902961772a1531b6502e4fb45a3e6fb76f.zip frameworks_base-2c7029902961772a1531b6502e4fb45a3e6fb76f.tar.gz frameworks_base-2c7029902961772a1531b6502e4fb45a3e6fb76f.tar.bz2 | |
Merge "Fix logic in fallback ringtone handling" into klp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/Ringtone.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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; |