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

Modified getCallerInfo to handle silent ringtone (comment added)

Browse Source 
Bug: 12800232
Change-Id: Ib382acdffe39ec063825ae79f80352a5e5636bc4
This commit is contained in:
Wenyi Wang
2015-09-15 16:46:29 -07:00
parent d063fd61bb
commit 750bb8549c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/com/android/internal/telephony/CallerInfo.java
View File

@@ -249,9 +249,17 @@ public class CallerInfo {
// look for the custom ringtone, create from the string stored
// in the database.
// An empty string ("") in the database indicates a silent ringtone,
// and we set contactRingtoneUri = Uri.EMPTY, so that no ringtone will be played.
// {null} in the database indicates the default ringtone,
// and we set contactRingtoneUri = null, so that default ringtone will be played.
columnIndex = cursor.getColumnIndex(PhoneLookup.CUSTOM_RINGTONE);
if ((columnIndex != -1) && (cursor.getString(columnIndex) != null)) {
info.contactRingtoneUri = Uri.parse(cursor.getString(columnIndex));
if (TextUtils.isEmpty(cursor.getString(columnIndex))) {
info.contactRingtoneUri = Uri.EMPTY;
} else {
info.contactRingtoneUri = Uri.parse(cursor.getString(columnIndex));
}
} else {
info.contactRingtoneUri = null;
}