commit 13287dfeb826c7aa22f739e18597a20628e74130
author Shuo Qian <shuoq@google.com> Tue Jun 27 21:07:34 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 27 21:07:35 2017 +0000
tree c268197e7d68a10c43318843f17d986f288a000a
parent c5729e0d537e0876f100bc4b3ca514961415a9eb
parent ca51a7cda7705169dad64e28f7cfb4a49560ff86

Merge "Check 'number' against both empty and null string for handleCdmaCallWaiting" into oc-dr1-dev

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 72b659e..381c131 100644
--- a/src/com/android/services/telephony/PstnIncomingCallNotifier.java
+++ b/src/com/android/services/telephony/PstnIncomingCallNotifier.java
@@ -139,7 +139,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);
                 }
             }