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

am: 4f3a7589bc Change-Id: Id9a51ea55922879c2776964d7a0d3c7a3ad8877b
2016-06-21 18:09:07 +00:00
parent e4d1e73c87 4f3a7589bc
commit 7fffd051fa
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)