commit e2f59b90ad21ecc07a584a06575a4c4ba75e1eb6
author Pavel Zhamaitsiak <pavelz@google.com> Mon Jun 20 17:52:48 2016 -0700
committer Pavel Zhamaitsiak <pavelz@google.com> Mon Jun 20 17:52:48 2016 -0700
tree 5c68bcf043da34a28fb37a4bff7d671366f54959
parent 018444ab61c09d907fd09515e783ffcffaaa2cf2

Hide WFC settings if WFC is not provisioned (and provisioning is required)

Bug: 29223318
Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7

src/com/android/settings/WirelessSettings.java

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index ddd45c3..722a861 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -356,7 +356,8 @@
 
         // update WFC setting
         final Context context = getActivity();
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
+        if (ImsManager.isWfcEnabledByPlatform(context) &&
+                ImsManager.isWfcProvisionedOnDevice(context)) {
             getPreferenceScreen().addPreference(mButtonWfc);
 
             mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
@@ -473,7 +474,8 @@
                     result.add(KEY_TETHER_SETTINGS);
                 }
 
-                if (!ImsManager.isWfcEnabledByPlatform(context)) {
+                if (!ImsManager.isWfcEnabledByPlatform(context) ||
+                        !ImsManager.isWfcProvisionedOnDevice(context)) {
                     result.add(KEY_WFC_SETTINGS);
                 }
 

src/com/android/settings/dashboard/SuggestionsChecks.java

diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java
index bde9035..5f140ba 100644
--- a/src/com/android/settings/dashboard/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/SuggestionsChecks.java
@@ -78,7 +78,8 @@
     }
 
     public boolean isWifiCallingUnavailableOrEnabled() {
-        if (!ImsManager.isWfcEnabledByPlatform(mContext)) {
+        if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
+                !ImsManager.isWfcProvisionedOnDevice(mContext)) {
             return true;
         }
         return ImsManager.isWfcEnabledByUser(mContext)