commit ad7e89a3f2b9da0f5985d2223ccc428e25bb86f1
author Shuo Qian <shuoq@google.com> Wed Aug 09 18:00:01 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 09 18:00:01 2017 +0000
tree 13da8339437ab44a6dfc4a8f36741d4b22749695
parent 1ed70c32f46a346626aab2e9163d3ee8497a798a
parent b7d4b6bbac0d78327449ee9cd19b200d5176a71e

Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting"

src/com/android/services/telephony/PstnIncomingCallNotifier.java

diff --git a/src/com/android/services/telephony/PstnIncomingCallNotifier.java b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
index 47fac6a..8596e3e 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -149,7 +149,7 @@
             Connection connection = call.getLatestConnection();
             if (connection != null) {
                 String number = connection.getAddress();
-                if (number != null && Objects.equals(number, ccwi.number)) {
+                if (!TextUtils.isEmpty(number) && Objects.equals(number, ccwi.number)) {
                     sendIncomingCallIntent(connection);
                 }
             }