Merge \\"Hide WFC settings if WFC is not provisioned (and provisioning is required)\\" into nyc-mr1-dev am: 4f3a7589bc

am: 7fffd051fa Change-Id: Ia77035148f6f3784fee1109345043f5cbb1c1db2
2016-06-21 18:12:07 +00:00
parent 3b50d91ee9 7fffd051fa
commit 646cb279b5
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)