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

Commit 1726f251 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Add test case for restricted state change notification" am: d6e44228 

am: ccdfa9ad

Change-Id: If01ac44f9f2a4df18cfa836c47f9f5afc2e0028d
parents 75e56271 ccdfa9ad

src/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -4095,7 +4095,8 @@ public class ServiceStateTracker extends Handler { 
     *

     * @param notifyType is one state of PS/CS_*_ENABLE/DISABLE

     */

    private void setNotification(int notifyType) {

    @VisibleForTesting

    public void setNotification(int notifyType) {

        if (DBG) log("setNotification: create notification " + notifyType);



        // Needed because sprout RIL sends these when they shouldn't?

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+8 −0
Original line number Diff line number Diff line
@@ -2101,4 +2101,12 @@ public class SimulatedCommands extends BaseCommands 
    @Override

    public void unregisterForPcoData(Handler h) {

    }



    @VisibleForTesting

    public void triggerRestrictedStateChanged(int restrictedState) {

        if (mRestrictedStateRegistrant != null) {

            mRestrictedStateRegistrant.notifyRegistrant(

                    new AsyncResult(null, new int[]{restrictedState}, null));

        }

    }

}

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+65 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import static org.mockito.Mockito.anyInt; 
import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -775,6 +776,70 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertEquals(EVENT_PS_RESTRICT_DISABLED, messageArgumentCaptor.getValue().what);

    }



    @Test

    @MediumTest

    public void testOnRestrictedStateChanged() throws Exception {

        ServiceStateTracker spySst = spy(sst);

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        doReturn(IccCardApplicationStatus.AppState.APPSTATE_READY).when(

                mUiccCardApplication3gpp).getState();

        spySst.updatePhoneType();



        // Combination of restricted state and expected notification type.

        final int CS_ALL[] = {RILConstants.RIL_RESTRICTED_STATE_CS_ALL,

                ServiceStateTracker.CS_ENABLED};

        final int CS_NOR[] = {RILConstants.RIL_RESTRICTED_STATE_CS_NORMAL,

                ServiceStateTracker.CS_NORMAL_ENABLED};

        final int CS_EME[] = {RILConstants.RIL_RESTRICTED_STATE_CS_EMERGENCY,

                ServiceStateTracker.CS_EMERGENCY_ENABLED};

        final int CS_NON[] = {RILConstants.RIL_RESTRICTED_STATE_NONE,

                ServiceStateTracker.CS_DISABLED};

        final int PS_ALL[] = {RILConstants.RIL_RESTRICTED_STATE_PS_ALL,

                ServiceStateTracker.PS_ENABLED};

        final int PS_NON[] = {RILConstants.RIL_RESTRICTED_STATE_NONE,

                ServiceStateTracker.PS_DISABLED};



        int notifyCount = 0;

        // cs not restricted -> cs emergency/normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_ALL);

        // cs emergency/normal restricted -> cs normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NOR);

        // cs normal restricted -> cs emergency restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_EME);

        // cs emergency restricted -> cs not restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NON);

        // cs not restricted -> cs normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NOR);

        // cs normal restricted -> cs emergency/normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_ALL);

        // cs emergency/normal restricted -> cs emergency restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_EME);

        // cs emergency restricted -> cs emergency/normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_ALL);

        // cs emergency/normal restricted -> cs not restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NON);

        // cs not restricted -> cs emergency restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_EME);

        // cs emergency restricted -> cs normal restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NOR);

        // cs normal restricted -> cs not restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, CS_NON);



        // ps not restricted -> ps restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, PS_ALL);

        // ps restricted -> ps not restricted

        internalCheckForRestrictedStateChange(spySst, ++notifyCount, PS_NON);

    }



    private void internalCheckForRestrictedStateChange(ServiceStateTracker serviceStateTracker,

                int times, int[] restrictedState) {

        mSimulatedCommands.triggerRestrictedStateChanged(restrictedState[0]);

        waitForMs(100);

        ArgumentCaptor<Integer> intArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(serviceStateTracker, times(times)).setNotification(intArgumentCaptor.capture());

        assertEquals(intArgumentCaptor.getValue().intValue(), restrictedState[1]);

    }



    @Test

    @MediumTest

    public void testRegisterForSubscriptionInfoReady() {