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

Commit fcbc60ea authored by Yifei Zhang's avatar Yifei Zhang Committed by Android (Google) Code Review
Browse files

Merge "do: fix flagging logic for cancelBlockScreenOn" into main

parents edfae3de 2f7e11f1

services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java

+6 −2
Original line number Diff line number Diff line
@@ -1700,10 +1700,12 @@ public final class DisplayPowerControllerTest { 
        verify(mDisplayOffloadSession, never()).cancelBlockScreenOn();

    }



    @RequiresFlagsEnabled(Flags.FLAG_OFFLOAD_SESSION_CANCEL_BLOCK_SCREEN_ON)

    @Test

    public void testOffloadBlocker_turnON_thenOFF_cancelBlockScreenOnNotCalledIfUnblocked() {

        // Set up.

        when(mDisplayManagerFlagsMock.isDisplayOffloadEnabled()).thenReturn(true);

        when(mDisplayManagerFlagsMock.isOffloadSessionCancelBlockScreenOnEnabled())

                .thenReturn(true);

        int initState = Display.STATE_OFF;

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);

        mHolder.dpc.setDisplayOffloadSession(mDisplayOffloadSession);
@@ -1737,10 +1739,12 @@ public final class DisplayPowerControllerTest { 
        verify(mDisplayOffloadSession, never()).cancelBlockScreenOn();

    }



    @RequiresFlagsEnabled(Flags.FLAG_OFFLOAD_SESSION_CANCEL_BLOCK_SCREEN_ON)

    @Test

    public void testOffloadBlocker_turnON_thenOFF_cancelBlockScreenOn() {

        // Set up.

        when(mDisplayManagerFlagsMock.isDisplayOffloadEnabled()).thenReturn(true);

        when(mDisplayManagerFlagsMock.isOffloadSessionCancelBlockScreenOnEnabled())

                .thenReturn(true);

        int initState = Display.STATE_OFF;

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);

        mHolder.dpc.setDisplayOffloadSession(mDisplayOffloadSession);