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

Commit 6e1c0db9 authored by Beverly's avatar Beverly
Browse files

Check doze transition before attempting to getState() 

getState throws and IllegalStateException if there
are pending transitions, so we need to gate
checks for DozeMachine.getState() to ensure
there are no transitions being executed.

If the device is in the middle of a doze transition,
then don't update the dock state.

Fixes: 320622153
Flag: NONE
Test: atest DozeDockHandlerTest
Test: manually send a lot of delayed notifications and then
dock device

Change-Id: I0aa2da1b7d507d77bb5978f0dd0340bca20b4d8d
parent 39fe4697

packages/SystemUI/src/com/android/systemui/doze/DozeDockHandler.java

+5 −1
Original line number Diff line number Diff line
@@ -93,7 +93,11 @@ public class DozeDockHandler implements DozeMachine.Part { 
            }



            mDockState = dockState;

            if (isPulsing()) {

            if (mMachine.isExecutingTransition() || isPulsing()) {

                // If the device is in the middle of executing a transition or is pulsing,

                // exit early instead of requesting a new state. DozeMachine

                // will check the docked state and resolveIntermediateState in the next

                // transition after pulse done.

                return;

            }

packages/SystemUI/tests/src/com/android/systemui/doze/DozeDockHandlerTest.java

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class DozeDockHandlerTest extends SysuiTestCase { 
        mDockHandler = new DozeDockHandler(mConfig, mDockManagerFake, mUserTracker);

        mDockHandler.setDozeMachine(mMachine);



        when(mMachine.isExecutingTransition()).thenReturn(false);

        when(mUserTracker.getUserId()).thenReturn(ActivityManager.getCurrentUser());

        when(mMachine.getState()).thenReturn(State.DOZE_AOD);

        doReturn(true).when(mConfig).alwaysOnEnabled(anyInt());
@@ -148,4 +149,13 @@ public class DozeDockHandlerTest extends SysuiTestCase { 


        verify(mMachine, never()).requestState(any(State.class));

    }



    @Test

    public void onEvent_dockedWhileTransitioning_wontRequestStateChange() {

        when(mMachine.isExecutingTransition()).thenReturn(true);



        mDockManagerFake.setDockEvent(DockManager.STATE_DOCKED_HIDE);



        verify(mMachine, never()).requestState(any(State.class));

    }

}