PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide WFC settings if WFC is not provisioned (and provisioning is required)" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-21 17:58:25 +00:00
committed by Android (Google) Code Review
parent a00e3b78de e2f59b90ad
commit 4f3a7589bc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/WirelessSettings.java
View File

@@ -356,7 +356,8 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
// update WFC setting // update WFC setting
final Context context = getActivity(); final Context context = getActivity();
if (ImsManager.isWfcEnabledByPlatform(context)) { if (ImsManager.isWfcEnabledByPlatform(context) &&
ImsManager.isWfcProvisionedOnDevice(context)) {
getPreferenceScreen().addPreference(mButtonWfc); getPreferenceScreen().addPreference(mButtonWfc);
mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary( mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
@@ -473,7 +474,8 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
result.add(KEY_TETHER_SETTINGS); result.add(KEY_TETHER_SETTINGS);
} }
if (!ImsManager.isWfcEnabledByPlatform(context)) { if (!ImsManager.isWfcEnabledByPlatform(context) ||
!ImsManager.isWfcProvisionedOnDevice(context)) {
result.add(KEY_WFC_SETTINGS); result.add(KEY_WFC_SETTINGS);
} }

3
src/com/android/settings/dashboard/SuggestionsChecks.java
View File

@@ -78,7 +78,8 @@ public class SuggestionsChecks {
} }
public boolean isWifiCallingUnavailableOrEnabled() { public boolean isWifiCallingUnavailableOrEnabled() {
if (!ImsManager.isWfcEnabledByPlatform(mContext)) { if (!ImsManager.isWfcEnabledByPlatform(mContext) ||
!ImsManager.isWfcProvisionedOnDevice(mContext)) {
return true; return true;
} }
return ImsManager.isWfcEnabledByUser(mContext) return ImsManager.isWfcEnabledByUser(mContext)