| commit | 5fb96bee6e4b47224134c6e5c6767be034a7a2f7 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Fri Jun 02 15:18:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 02 15:18:42 2017 +0000 |
| tree | dbe38857f724dce62a7d6316d90b690796c350bd | |
| parent | ad880ae6cdd3f08bc68b91f5b85432deb2b3c486 [diff] | |
| parent | 5de060545320b49e31ad39caf3f27a7dc34642e3 [diff] |
Merge "Use user WFC setting instead of checking WFC service status" am: 98c9c360fe am: 5de0605453 Change-Id: Iaa09160583d435a20684d84a03c21f4dc2548cfa
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())