commit dd3dc41b589977bca9621484aed15a7f1508e7f6
author Wenyi Wang <wenyiw@google.com> Fri Sep 18 17:51:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 18 17:51:33 2015 +0000
tree 8bbb6794139d983bae67505e5778e54780e555a9
parent 3cf50edd29f372657192ebdaf9ca197c74fe94ad
parent 6287536903eb28979f453303f75956e5368f08d5

Merge "Modified getCallerInfo() to handle silent ringtone" 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 5de03d8..06703b9 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -241,7 +241,7 @@
                 // in the database.
                 columnIndex = cursor.getColumnIndex(PhoneLookup.CUSTOM_RINGTONE);
                 if ((columnIndex != -1) && (cursor.getString(columnIndex) != null)) {
-                    if (cursor.getString(columnIndex).equals("")) {
+                    if (TextUtils.isEmpty(cursor.getString(columnIndex))) {
                         // make it consistent with frameworks/base/.../CallerInfo.java
                         info.contactRingtoneUri = Uri.EMPTY;
                     } else {