commit 5de060545320b49e31ad39caf3f27a7dc34642e3
author Tyler Gunn <tgunn@google.com> Fri Jun 02 15:15:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 15:15:13 2017 +0000
tree 75c1b755552fcbc44f0b9fec1bcccfa110f172f8
parent 2c833123a09b7b82e13d707b8ff368776cd24ec1
parent 98c9c360fe9bd558d89b1528f69f2574ce057ee7

Merge "Use user WFC setting instead of checking WFC service status"
am: 98c9c360fe

Change-Id: Ifadfa05025ba70480af6b03a2e497d282d955ebd

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 9ac40fd..41628e6 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -1741,7 +1741,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())