From d7969369dea3a58b2157c5fffa3eafb84d779a4d Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Mon, 17 May 2021 17:20:54 +0800 Subject: [PATCH] API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED CAPABILITY_ALLOWED_NETWORK_TYPES_USED is renamed CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK Bug: 182198501 Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java atest frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/RadioConfigResponseTest.java Change-Id: Id9a27ad972ba7b27311e1b8c6b245f42b94fc7be --- .../network/telephony/Enable2gPreferenceController.java | 2 +- .../telephony/Enable2gPreferenceControllerTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java index d336cb47e47..ab3da9e14df 100644 --- a/src/com/android/settings/network/telephony/Enable2gPreferenceController.java +++ b/src/com/android/settings/network/telephony/Enable2gPreferenceController.java @@ -76,7 +76,7 @@ public class Enable2gPreferenceController extends TelephonyTogglePreferenceContr && carrierConfig != null && !carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G) && mTelephonyManager.isRadioInterfaceCapabilitySupported( - mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED); + mTelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK); return visible ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } diff --git a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java index 5ade97953e0..9fb8a316fe6 100644 --- a/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java @@ -96,7 +96,7 @@ public final class Enable2gPreferenceControllerTest { @Test public void getAvailabilityStatus_nullCarrierConfig_returnUnavailable() { doReturn(true).when(mTelephonyManager).isRadioInterfaceCapabilitySupported( - mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED); + mTelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK); mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G, false); doReturn(null).when(mCarrierConfigManager); @@ -107,7 +107,7 @@ public final class Enable2gPreferenceControllerTest { @Test public void getAvailabilityStatus_capabilityNotSupported_returnUnavailable() { doReturn(false).when(mTelephonyManager).isRadioInterfaceCapabilitySupported( - mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED); + mTelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK); mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G, false); @@ -117,7 +117,7 @@ public final class Enable2gPreferenceControllerTest { @Test public void getAvailabilityStatus_returnAvailable() { doReturn(true).when(mTelephonyManager).isRadioInterfaceCapabilitySupported( - mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED); + mTelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK); mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G, false); @@ -146,7 +146,7 @@ public final class Enable2gPreferenceControllerTest { // Setup state to allow disabling doReturn(true).when(mTelephonyManager).isRadioInterfaceCapabilitySupported( - mTelephonyManager.CAPABILITY_ALLOWED_NETWORK_TYPES_USED); + mTelephonyManager.CAPABILITY_USES_ALLOWED_NETWORK_TYPES_BITMASK); mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_ENABLE_2G, false);