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

2016-06-21 17:58:25 +00:00
parent a00e3b78de e2f59b90ad
commit 4f3a7589bc
2 changed files with 6 additions and 3 deletions
--- 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)