commit 7afa98c7a46d9a251147d59672ff9b00d0777075
author Longsheng Ma <longsheng.ma@sony.com> Wed Aug 08 22:06:46 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 08 22:06:46 2018 -0700
tree 7cfa3ec695d8e22710a7f1493139e66b0c4e4f4e
parent 9d7beae07589dc01e5ee30dc24e9ed997dd1811e
parent 1c421cb024ec46b0dd664775194c7cf2f25d11aa

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

Change-Id: I75b8ccda5345f924c5a633c9e06f85d495118fe8

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;