commit 1c421cb024ec46b0dd664775194c7cf2f25d11aa
author Longsheng Ma <longsheng.ma@sony.com> Wed Aug 08 11:11:39 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 11:11:39 2018 -0700
tree 04ac716b780ea1749d9534017644fc82e5cdf234
parent 4459d8199aba60255bc8746d7b78aacf93049702
parent a103d4b3a77a3543ddbeea057130608d963c2762

Merge "Fix issue that "Wi-Fi call" disappears when Wi-Fi call is on hold" am: 0e51ec107b am: 91ab769c11
am: a103d4b3a7

Change-Id: I559e5cfcc1c46e8c2faa3348d75e065ad3641ea4

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

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index c7fc428..409eb47 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1996,9 +1996,8 @@
     }
 
     private void updateStatusHints() {
-        boolean isIncoming = isValidRingingCall();
-        if (mIsWifi && (isIncoming || getState() == STATE_ACTIVE)) {
-            int labelId = isIncoming
+        if (mIsWifi && getPhone() != null) {
+            int labelId = isValidRingingCall()
                     ? R.string.status_hint_label_incoming_wifi_call
                     : R.string.status_hint_label_wifi_call;