commit 7df41348d12bdce3c26ae7f4e5e61723ad64a5b8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 25 16:46:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 25 16:46:39 2020 +0000
tree 94f9a7f3442371afcb156bfefd056e0bb0538fc1
parent fe5f49d992d4029fd7adb280a5b8cd1730523705
parent 5407025e7e1288405515421f54744284a498783f

Merge "Check if WFC enabled by platform when decide whether to show the WFC prompt."

src/com/android/phone/ImsUtil.java

diff --git a/src/com/android/phone/ImsUtil.java b/src/com/android/phone/ImsUtil.java
index 18fc534..38936ec 100644
--- a/src/com/android/phone/ImsUtil.java
+++ b/src/com/android/phone/ImsUtil.java
@@ -113,12 +113,18 @@
     public static boolean shouldPromoteWfc(Context context, int phoneId) {
         CarrierConfigManager cfgManager = (CarrierConfigManager) context
                 .getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        if (cfgManager == null || !cfgManager.getConfigForSubId(getSubId(phoneId))
-                .getBoolean(CarrierConfigManager.KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL)) {
+
+        ImsManager imsManager = ImsManager.getInstance(context, phoneId);
+        if (!imsManager.isWfcEnabledByPlatform()) {
             return false;
         }
 
-        if (!getDefaultImsManagerInstance(context).isWfcProvisionedOnDevice()) {
+        if (!imsManager.isWfcProvisionedOnDevice()) {
+            return false;
+        }
+
+        if (cfgManager == null || !cfgManager.getConfigForSubId(getSubId(phoneId))
+                .getBoolean(CarrierConfigManager.KEY_CARRIER_PROMOTE_WFC_ON_CALL_FAIL_BOOL)) {
             return false;
         }