Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '2c7029902961772a1531b6502e4fb45a3e6fb76f':
  Fix logic in fallback ringtone handling
This commit is contained in:
Marco Nelissen
2013-09-26 12:58:04 -07:00
committed by Android Git Automerger
parent 8d097b2603 2c70299029
commit 6e14f9bc90
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/Ringtone.java
View File

@@ -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;