commit 853f00a95256d588c736bca3031137cacb23e11b
author Shuo Qian <shuoq@google.com> Wed Aug 09 18:08:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 09 18:08:10 2017 +0000
tree faa045de54e949e64343ccf23cab32409b8ecad9
parent d4b98a41ea35983ee4b7b10f50a35718f505e370
parent ad7e89a3f2b9da0f5985d2223ccc428e25bb86f1

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

Change-Id: Ib8115750b3281cfb3f0250ab22d3d0328d1fe617

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