commit b7d4b6bbac0d78327449ee9cd19b200d5176a71e
author sqian <shuoq@google.com> Tue Jun 27 11:27:30 2017 -0700
committer sqian <shuoq@google.com> Tue Aug 08 11:29:23 2017 -0700
tree 13da8339437ab44a6dfc4a8f36741d4b22749695
parent 1ed70c32f46a346626aab2e9163d3ee8497a798a

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

The new RIL in O changes all null strings to empty strings, but the code
only checks 'number' against null for handleCdmaCallWaiting. This CL adds
the check against both empty and null strings.

Test: TreeHugger
Bug: 62490549
Change-Id: I9f4f577c40bcd5caa2a9bb1fd4c9e9c4c27e318c
Merged-In: I9f4f577c40bcd5caa2a9bb1fd4c9e9c4c27e318c

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