Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7969369 authored by SongFerngWang's avatar SongFerngWang
Browse files

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
parent c26fabff

src/com/android/settings/network/telephony/Enable2gPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

tests/unit/src/com/android/settings/network/telephony/Enable2gPreferenceControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -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);