Merge Android 12L

Bug: 222710654
Merged-In: I7914ce0266c443adf0f189c4971f6d036ed8b420
Change-Id: I550dc397605c2ba47f0ccc05cd7888862a0c4e3a

1 files changed, 3 insertions, 5 deletions

diff --git a/src/com/android/imsserviceentitlement/utils/ImsUtils.java b/src/com/android/imsserviceentitlement/utils/ImsUtils.java
index 2ae94d8..d03d8f8 100644
--- a/src/com/android/imsserviceentitlement/utils/ImsUtils.java
+++ b/src/com/android/imsserviceentitlement/utils/ImsUtils.java
@@ -83,11 +83,9 @@ public class ImsUtils {
     }
 
     /** Changes persistent WFC enabled setting. */
-    public void setWfcSetting(boolean enabled, boolean force) {
+    public void setWfcSetting(boolean enabled) {
         try {
-            if (force) {
-                mImsMmTelManager.setVoWiFiSettingEnabled(enabled);
-            }
+            mImsMmTelManager.setVoWiFiSettingEnabled(enabled);
         } catch (RuntimeException e) {
             // ignore this exception, possible exception should be NullPointerException or
             // RemoteException.
@@ -214,6 +212,6 @@ public class ImsUtils {
 
     /** Disables WFC */
     public void disableWfc() {
-        setWfcSetting(false, false);
+        setWfcSetting(false);
     }
 }