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

Commit d41ee545 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "mainline:Replace serviceState.getDataRegState with... 

Merge "mainline:Replace serviceState.getDataRegState with getDataRegistrationState" am: c5e78649 am: ed119d3b

Change-Id: I694cb96db9ebb8258bb2c423e6c04133b747f1c8
parents 7e1e2b7d ed119d3b

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

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

    public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {

        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(

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

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {

        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(

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

    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {

        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(

                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 Diff line number Diff line
@@ -115,11 +115,12 @@ public class EnabledNetworkModePreferenceControllerTest { 
                true);



        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);



        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);

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

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

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

import android.telephony.TelephonyManager;



import androidx.fragment.app.FragmentManager;

import androidx.preference.ListPreference;



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



        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);



        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);

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