diff options
| author | Wenyi Wang <wenyiw@google.com> | 2015-09-17 21:01:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-17 21:01:50 +0000 |
| commit | aade8ed7c3d36a55ae6b0703ca7b257097ddcc91 (patch) | |
| tree | 5faf87746edb4149addf75ae2e02de187672a339 /InCallUI | |
| parent | ad9a5f36ed22b45c31fce53f98ce3af00a4df020 (diff) | |
| parent | 96c2b755cf0c503fc152268e3e5761f3074ac6b1 (diff) | |
Merge "Modified getCallerInfo() to handle silent ringtone" into ub-contactsdialer-a-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallerInfo.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java index c7f032345..f15cb5d49 100644 --- a/InCallUI/src/com/android/incallui/CallerInfo.java +++ b/InCallUI/src/com/android/incallui/CallerInfo.java @@ -241,7 +241,12 @@ public class CallerInfo { // in the database. columnIndex = cursor.getColumnIndex(PhoneLookup.CUSTOM_RINGTONE); if ((columnIndex != -1) && (cursor.getString(columnIndex) != null)) { - info.contactRingtoneUri = Uri.parse(cursor.getString(columnIndex)); + if (cursor.getString(columnIndex).equals("")) { + // make it consistent with frameworks/base/.../CallerInfo.java + info.contactRingtoneUri = Uri.EMPTY; + } else { + info.contactRingtoneUri = Uri.parse(cursor.getString(columnIndex)); + } } else { info.contactRingtoneUri = null; } |