commit 78205527bd51fda09f0698afcc9654888b9da667
author Anne Rong <annerong@google.com> Fri Sep 18 00:33:12 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 18 00:33:12 2015 +0000
tree be565344f32ee665dcd5db75118a025fb85850b2
parent aade8ed7c3d36a55ae6b0703ca7b257097ddcc91
parent 204f7f076ac79684484044f3c534c6b2fe71b7e4

Merge "FilteredNumberAsyncQueryHandler should not crash if number is invalid" into ub-contactsdialer-a-dev

InCallUI/src/com/android/incallui/CallerInfo.java

diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index c7f0323..f15cb5d 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -241,7 +241,12 @@
                 // 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;
                 }