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

Commit 05238019 authored by Sukhwan Mun's avatar Sukhwan Mun
Browse files

rename SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK to _BLOCKS 

Rename SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK to SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS

Bug: 315094087
Test: atest ImsPhoneTest
Change-Id: I7befd59ee690c65c288a4eadec3a76ae2d8e5fc4
parent 51f404dd

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_NONE; 
import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_PLMN_BLOCK;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_PLMN_BLOCK_WITH_TIMEOUT;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_RAT_BLOCK;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS;

import static android.telephony.ims.stub.ImsRegistrationImplBase.REGISTRATION_TECH_NONE;



import static com.android.internal.telephony.CommandsInterface.CB_FACILITY_BAIC;
@@ -2531,7 +2531,7 @@ public class ImsPhone extends ImsPhoneBase { 
                    suggestedModemAction = suggestedAction;

                } else if (mFeatureFlags.addRatRelatedSuggestedActionToImsRegistration()) {

                    if ((suggestedAction == SUGGESTED_ACTION_TRIGGER_RAT_BLOCK)

                            || (suggestedAction == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK)) {

                            || (suggestedAction == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS)) {

                        suggestedModemAction = suggestedAction;

                    }

                }

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneTest.java

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.telephony.CarrierConfigManager.USSD_OVER_CS_PREFERRED; 
import static android.telephony.CarrierConfigManager.USSD_OVER_IMS_ONLY;

import static android.telephony.CarrierConfigManager.USSD_OVER_IMS_PREFERRED;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_NONE;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_PLMN_BLOCK;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_PLMN_BLOCK_WITH_TIMEOUT;

import static android.telephony.ims.RegistrationManager.SUGGESTED_ACTION_TRIGGER_RAT_BLOCK;
@@ -1531,13 +1531,13 @@ public class ImsPhoneTest extends TelephonyTest { 


        // unregistered with rat block clear

        registrationCallback.onUnregistered(reasonInfo,

                SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK,

                SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS,

                REGISTRATION_TECH_LTE);

        regInfo = mSimulatedCommands.getImsRegistrationInfo();



        assertTrue(regInfo[0] == RegistrationManager.REGISTRATION_STATE_NOT_REGISTERED

                && regInfo[1] == REGISTRATION_TECH_LTE

                && regInfo[2] == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK);

                && regInfo[2] == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS);



        // reset the registration info saved in the SimulatedCommands

        mSimulatedCommands.updateImsRegistrationInfo(0, 0, 0, 0, null);
@@ -1547,13 +1547,13 @@ public class ImsPhoneTest extends TelephonyTest { 


        // verfies that duplicated notification with the same suggested action is invoked

        registrationCallback.onUnregistered(reasonInfo,

                SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK,

                SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS,

                REGISTRATION_TECH_LTE);

        regInfo = mSimulatedCommands.getImsRegistrationInfo();



        assertTrue(regInfo[0] == RegistrationManager.REGISTRATION_STATE_NOT_REGISTERED

                && regInfo[1] == REGISTRATION_TECH_LTE

                && regInfo[2] == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCK);

                && regInfo[2] == SUGGESTED_ACTION_TRIGGER_CLEAR_RAT_BLOCKS);

    }



    @Test