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

Commit 4ea57acf authored by Oleg Blinnikov's avatar Oleg Blinnikov Committed by Android (Google) Code Review
Browse files

Merge "Fix tests for removal of External Display" into main

parents 86c20077 f74371c3

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

+11 −3
Original line number Diff line number Diff line
@@ -2633,11 +2633,19 @@ public class DisplayManagerServiceTest { 
        // Create default display device

        createFakeDisplayDevice(displayManager, new float[]{60f}, Display.TYPE_INTERNAL);

        callback.waitForExpectedEvent();



        callback.expectsEvent(EVENT_DISPLAY_ADDED);

        FakeDisplayDevice displayDevice =

                createFakeDisplayDevice(displayManager, new float[]{60f}, Display.TYPE_EXTERNAL);

        callback.waitForExpectedEvent();



        callback.expectsEvent(EVENT_DISPLAY_REMOVED);

        displayManager.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);

        callback.waitForExpectedEvent();



        callback.expectsEvent(EVENT_DISPLAY_ADDED);

        LogicalDisplay display =

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

        callback.expectsEvent(EVENT_DISPLAY_ADDED);

        logicalDisplayMapper.setEnabledLocked(display, /* isEnabled= */ true);

        logicalDisplayMapper.updateLogicalDisplays();

        callback.waitForExpectedEvent();
@@ -2660,6 +2668,7 @@ public class DisplayManagerServiceTest { 
        LogicalDisplayMapper logicalDisplayMapper = displayManager.getLogicalDisplayMapper();

        FakeDisplayManagerCallback callback = new FakeDisplayManagerCallback();

        bs.registerCallbackWithEventMask(callback, STANDARD_DISPLAY_EVENTS);

        displayManager.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);

        callback.expectsEvent(EVENT_DISPLAY_ADDED);

        // Create default display device

        createFakeDisplayDevice(displayManager, new float[]{60f}, Display.TYPE_INTERNAL);
@@ -2673,7 +2682,6 @@ public class DisplayManagerServiceTest { 
        logicalDisplayMapper.setEnabledLocked(display, /* isEnabled= */ true);

        logicalDisplayMapper.updateLogicalDisplays();

        callback.waitForExpectedEvent();

        callback.clear();



        assertThrows(SecurityException.class, () -> bs.disableConnectedDisplay(displayId));

    }
@@ -3376,7 +3384,7 @@ public class DisplayManagerServiceTest { 


        void waitForExpectedEvent(Duration timeout) {

            try {

                assertWithMessage("Event '" + mExpectedEvent + "' is received.")

                assertWithMessage("Expected '" + mExpectedEvent + "'")

                        .that(mLatch.await(timeout.toMillis(), TimeUnit.MILLISECONDS)).isTrue();

            } catch (InterruptedException ex) {

                throw new AssertionError("Waiting for expected event interrupted", ex);