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

Commit d569cdb5 authored by Oleg Blinnikov's avatar Oleg Blinnikov
Browse files

Update display after it gets disabled 

Change-Id: I7b5117bfe25b13e9cdaacfffe0e5e78907148622
Bug: 318595765
Test: atest ExternalDisplayPolicyTest DisplayManagerServiceTest
parent d4f04830

services/core/java/com/android/server/display/ExternalDisplayPolicy.java

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ class ExternalDisplayPolicy { 
        } else {

            // As external display is enabled by default, need to disable it now.

            // TODO(b/292196201) Remove when the display can be disabled before DPC is created.

            logicalDisplay.setEnabledLocked(false);

            mLogicalDisplayMapper.setDisplayEnabledLocked(logicalDisplay, false);

        }



        if (!isExternalDisplayAllowed()) {

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

+2 −1
Original line number Diff line number Diff line
@@ -2429,8 +2429,9 @@ public class DisplayManagerServiceTest { 
        LogicalDisplay display =

                logicalDisplayMapper.getDisplayLocked(displayDevice, /* includeDisabled= */ true);

        assertThat(display.isEnabledLocked()).isFalse();

        // TODO(b/332711269) make sure only one DISPLAY_GROUP_EVENT_ADDED sent.

        assertThat(callback.receivedEvents()).containsExactly(DISPLAY_GROUP_EVENT_ADDED,

                EVENT_DISPLAY_CONNECTED).inOrder();

                DISPLAY_GROUP_EVENT_ADDED, EVENT_DISPLAY_CONNECTED).inOrder();

    }



    @Test

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

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ public class ExternalDisplayPolicyTest { 
                mDisplayEventCaptor.capture());

        assertThat(mLogicalDisplayCaptor.getValue()).isEqualTo(mMockedLogicalDisplay);

        assertThat(mDisplayEventCaptor.getValue()).isEqualTo(EVENT_DISPLAY_CONNECTED);

        verify(mMockedLogicalDisplay).setEnabledLocked(false);

        verify(mMockedLogicalDisplayMapper).setDisplayEnabledLocked(eq(mMockedLogicalDisplay),

                eq(false));

        clearInvocations(mMockedLogicalDisplayMapper);

        clearInvocations(mMockedLogicalDisplay);

    }