commit 9415e66b9cbefba91cf1ad7f07245c8c861733a7
author Meng Wang <mewan@google.com> Thu Apr 20 19:51:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 19:51:47 2017 +0000
tree 6b0f5e7de9b5a197889bc7ba216c11a233a944ca
parent 3209025447f491fbd689572b4aa9909db47e56c4
parent 40a9d0b106ac761234126dd74687924834dd09b3

Merge "Remove redundent logic in isWfcProvisioned" am: 548633b97c am: 0a32f1aba8
am: 40a9d0b106

Change-Id: I535f031487e8b1a071597412a37ccf48e7a33016

src/com/android/phone/ImsUtil.java

diff --git a/src/com/android/phone/ImsUtil.java b/src/com/android/phone/ImsUtil.java
index 8ee7773..b6c88ae 100644
--- a/src/com/android/phone/ImsUtil.java
+++ b/src/com/android/phone/ImsUtil.java
@@ -60,21 +60,6 @@
     }
 
     /**
-     * @return {@code true} if WFC is provisioned on the device.
-     */
-    public static boolean isWfcProvisioned(Context context) {
-        CarrierConfigManager cfgManager = (CarrierConfigManager) context
-                .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-            if (cfgManager != null
-                    && cfgManager.getConfig().getBoolean(
-                            CarrierConfigManager.KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL)
-                    && !ImsManager.isVolteProvisionedOnDevice(context)) {
-                return false;
-            }
-            return ImsManager.isWfcProvisionedOnDevice(context);
-    }
-
-    /**
      * @return {@code true} if the device is configured to use "Wi-Fi only" mode. If WFC is not
      * enabled, this will return {@code false}.
      */
@@ -101,7 +86,7 @@
             return false;
         }
 
-        if (!isWfcProvisioned(context)) {
+        if (!ImsManager.isWfcProvisionedOnDevice(context)) {
             return false;
         }