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

Commit 9cd3d0da authored by SongFerngWang's avatar SongFerngWang
Browse files

mainline:Replace serviceState.getDataRegState with getDataRegistrationState 

Bug: 146637978
Test: - make RunSettingsRoboTests ROBOTEST_FILTER\
=PreferredNetworkModePreferenceControllerTest (PASS)
- make RunSettingsRoboTests ROBOTEST_FILTER\
=EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
Merged-In: I5a4a1a2b0dc5140257963651b69c0f427ef5ae93
parent d792d200

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -246,7 +246,8 @@ public class SimStatusDialogControllerTest { 
    @Ignore

    @Ignore

    public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {

    public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(

                ServiceState.STATE_OUT_OF_SERVICE);

        when(mPersistableBundle.getBoolean(

        when(mPersistableBundle.getBoolean(

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
@@ -261,7 +262,7 @@ public class SimStatusDialogControllerTest { 
    @Ignore

    @Ignore

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mPersistableBundle.getBoolean(

        when(mPersistableBundle.getBoolean(

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
@@ -311,7 +312,7 @@ public class SimStatusDialogControllerTest { 
    @Ignore

    @Ignore

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mPersistableBundle.getBoolean(

        when(mPersistableBundle.getBoolean(

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);

                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);

tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -115,11 +115,12 @@ public class EnabledNetworkModePreferenceControllerTest { 
                true);

                true);





        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(

                ServiceState.STATE_OUT_OF_SERVICE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);





        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);





        when(mServiceState.getRoaming()).thenReturn(false);

        when(mServiceState.getRoaming()).thenReturn(false);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ import android.telephony.ServiceState; 
import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;





import androidx.fragment.app.FragmentManager;

import androidx.preference.ListPreference;

import androidx.preference.ListPreference;





import com.android.settings.R;

import com.android.settings.R;
@@ -111,11 +110,12 @@ public class PreferredNetworkModePreferenceControllerTest { 
                true);

                true);





        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(

                ServiceState.STATE_OUT_OF_SERVICE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);





        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);

        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);





        when(mServiceState.getRoaming()).thenReturn(false);

        when(mServiceState.getRoaming()).thenReturn(false);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);