commit c6c849171bb42f06b84b6da6e1185ca4122c04ac
author Shuo Qian <shuoq@google.com> Wed Aug 09 18:16:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 18:16:17 2017 +0000
tree 4151a8fbbdfcca095a83728fee1cc091736f026d
parent 1d268428988b376deecee779bdb7a02aba54794d
parent 853f00a95256d588c736bca3031137cacb23e11b

Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting" am: ad7e89a3f2
am: 853f00a952

Change-Id: Id2a11f8821ddce473c6b53ebf1dac7a3667876f2

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);
                 }
             }