commit 56dbb602b23ef1a10347fe1f7bb245978d86a22c
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 21 21:44:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 21 21:44:52 2016 +0000
tree 4549a9c6a0a69a90d5c3ca28fb0c1f493d5a8ec3
parent 87c4379d98ce21b8ba4dd9b5fe9ff54fb31fc161
parent c236d6b7ad95481ec831905c15e563498d65dc3e

Merge "Add dumpsys handler for telephony" into nyc-mr1-dev

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index d74558f..33aba17 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -300,7 +300,8 @@
             } else {
                 prefSet.removePreference(wifiCallingSettings);
             }
-        } else if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext())) {
+        } else if (!ImsManager.isWfcEnabledByPlatform(mPhone.getContext()) ||
+                !ImsManager.isWfcProvisionedOnDevice(mPhone.getContext())) {
             prefSet.removePreference(wifiCallingSettings);
         } else {
             int resId = com.android.internal.R.string.wifi_calling_off_summary;