diff options
| author | Meng Wang <mewan@google.com> | 2021-12-07 18:32:31 +0000 |
|---|---|---|
| committer | Meng Wang <mewan@google.com> | 2021-12-07 22:26:17 +0000 |
| commit | 2fd1705fd58e80bb74fb6778d863938418db4507 (patch) | |
| tree | 27bf65b24974730944a8508f532fdbc5e71e3302 | |
| parent | ee02b4a909fa1f7b4d0a45926c588ddfe1524041 (diff) | |
| download | ImsServiceEntitlement-2fd1705fd58e80bb74fb6778d863938418db4507.tar.gz | |
Fix issue that disableWfc was no-op
Bug: 209547803
Test: manual
Test: unit test pass - atest
Change-Id: I36106a21155c8ea4ded0b1c00081832aec1a3b8b
| -rw-r--r-- | src/com/android/imsserviceentitlement/utils/ImsUtils.java | 8 | ||||
| -rw-r--r-- | tests/unittests/src/com/android/imsserviceentitlement/utils/ImsUtilsTest.java | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/com/android/imsserviceentitlement/utils/ImsUtils.java b/src/com/android/imsserviceentitlement/utils/ImsUtils.java index d24456f..5681afe 100644 --- a/src/com/android/imsserviceentitlement/utils/ImsUtils.java +++ b/src/com/android/imsserviceentitlement/utils/ImsUtils.java @@ -93,11 +93,9 @@ public class ImsUtils { } /** Changes persistent WFC enabled setting. */ - private void setWfcSetting(boolean enabled, boolean force) { + private 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. @@ -222,6 +220,6 @@ public class ImsUtils { /** Disables WFC */ public void disableWfc() { - setWfcSetting(false, false); + setWfcSetting(false); } } diff --git a/tests/unittests/src/com/android/imsserviceentitlement/utils/ImsUtilsTest.java b/tests/unittests/src/com/android/imsserviceentitlement/utils/ImsUtilsTest.java index bd5397b..961e913 100644 --- a/tests/unittests/src/com/android/imsserviceentitlement/utils/ImsUtilsTest.java +++ b/tests/unittests/src/com/android/imsserviceentitlement/utils/ImsUtilsTest.java @@ -57,7 +57,7 @@ public class ImsUtilsTest { } @Test - public void disableAndResetVoWiFiImsSettings_hasCarrierConfig_() { + public void disableAndResetVoWiFiImsSettings_hasCarrierConfig() { PersistableBundle carrierConfig = new PersistableBundle(); carrierConfig.putInt(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_MODE_INT, 1); carrierConfig.putInt(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT, 2); @@ -66,7 +66,18 @@ public class ImsUtilsTest { imsUtils.disableAndResetVoWiFiImsSettings(); + verify(mMockImsMmTelManager).setVoWiFiSettingEnabled(eq(false)); verify(mMockImsMmTelManager).setVoWiFiModeSetting(eq(1)); verify(mMockImsMmTelManager).setVoWiFiRoamingModeSetting(eq(2)); } + + @Test + public void disableWfc() { + ImsUtils imsUtils = new ImsUtils( + new PersistableBundle(), mMockImsMmTelManager, mMockProvisioningManager); + + imsUtils.disableWfc(); + + verify(mMockImsMmTelManager).setVoWiFiSettingEnabled(false); + } } |