From e2f59b90ad21ecc07a584a06575a4c4ba75e1eb6 Mon Sep 17 00:00:00 2001 From: Pavel Zhamaitsiak Date: Mon, 20 Jun 2016 17:52:48 -0700 Subject: [PATCH] Hide WFC settings if WFC is not provisioned (and provisioning is required) Bug: 29223318 Change-Id: Ic927e742d84f55ea411a0d034fc1caac72ee58e7 --- src/com/android/settings/WirelessSettings.java | 6 ++++-- src/com/android/settings/dashboard/SuggestionsChecks.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index ddd45c39b38..722a861fbda 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -356,7 +356,8 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde // 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 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde result.add(KEY_TETHER_SETTINGS); } - if (!ImsManager.isWfcEnabledByPlatform(context)) { + if (!ImsManager.isWfcEnabledByPlatform(context) || + !ImsManager.isWfcProvisionedOnDevice(context)) { result.add(KEY_WFC_SETTINGS); } diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java index bde9035dda7..5f140ba0b0d 100644 --- a/src/com/android/settings/dashboard/SuggestionsChecks.java +++ b/src/com/android/settings/dashboard/SuggestionsChecks.java @@ -78,7 +78,8 @@ public class SuggestionsChecks { } public boolean isWifiCallingUnavailableOrEnabled() { - if (!ImsManager.isWfcEnabledByPlatform(mContext)) { + if (!ImsManager.isWfcEnabledByPlatform(mContext) || + !ImsManager.isWfcProvisionedOnDevice(mContext)) { return true; } return ImsManager.isWfcEnabledByUser(mContext)