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

Commit a86bc76e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update signal strength on ServiceState in service" am: 3169b21b am: 49286875 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I908564533b6813aeffe1ed57ef0416dd7f1fce25
parents dfba9408 49286875

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+6 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 


    private SubscriptionInfo mSubscriptionInfo;

    private TelephonyDisplayInfo mTelephonyDisplayInfo;

    private ServiceState mPreviousServiceState;



    private final int mSlotIndex;

    private TelephonyManager mTelephonyManager;
@@ -437,6 +438,9 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        final int state = Utils.getCombinedServiceState(serviceState);

        if (!Utils.isInService(serviceState)) {

            resetSignalStrength();

        } else if (!Utils.isInService(mPreviousServiceState)) {

            // If ServiceState changed from out of service -> in service, update signal strength.

            updateSignalStrength(mTelephonyManager.getSignalStrength());

        }



        String serviceStateValue;
@@ -484,7 +488,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        }



        ServiceState serviceState = mTelephonyManager.getServiceState();

        if (serviceState == null || !Utils.isInService(serviceState)) {

        if (!Utils.isInService(serviceState)) {

            return;

        }
@@ -767,6 +771,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
                updateNetworkProvider();

                updateServiceState(serviceState);

                updateRoamingStatus(serviceState);

                mPreviousServiceState = serviceState;

            }



            @Override

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

+7 −6
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import static org.mockito.Mockito.doNothing; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.robolectric.Shadows.shadowOf;
@@ -293,7 +294,7 @@ public class SimStatusDialogControllerTest { 


        final String signalStrengthString =

                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);

        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

    }



    @Test
@@ -310,7 +311,7 @@ public class SimStatusDialogControllerTest { 


        final String signalStrengthString =

                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);

        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

    }



    @Test
@@ -330,7 +331,7 @@ public class SimStatusDialogControllerTest { 


        final String signalStrengthString =

                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);

        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);

    }



    @Test
@@ -394,8 +395,8 @@ public class SimStatusDialogControllerTest { 


        mController.initialize();



        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);

        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);

        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);

        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);

    }



    @Test
@@ -405,7 +406,7 @@ public class SimStatusDialogControllerTest { 


        mController.initialize();



        verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());

        verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());

        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);

        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);

    }