commit 9a7fa0550b3f314af5be209ffea363c03d6451cd
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 02 19:41:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 02 19:41:07 2017 +0000
tree e3df6b59935da1f8d570be19e1823d0de717d2a5
parent 98c9c360fe9bd558d89b1528f69f2574ce057ee7
parent 8fd9a40fbec7e3bcc00b67d13f9799fa77fa6a09

Merge "Fix NullPointerException in supp service notify handler."

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 f7ceb2e..a403d1f 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1742,7 +1742,7 @@
         boolean isVoWifiEnabled = false;
         if (isIms) {
             ImsPhone imsPhone = (ImsPhone) phone;
-            isVoWifiEnabled = imsPhone.isWifiCallingEnabled();
+            isVoWifiEnabled = ImsUtil.isWfcEnabled(phone.getContext());
         }
         PhoneAccountHandle phoneAccountHandle = isIms ? PhoneUtils
                 .makePstnPhoneAccountHandle(phone.getDefaultPhone())