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

Commit 88c87429 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make onVirtualDisplayRemoved callback idempotent." into udc-qpr-dev

parents 40383d79 45a6bab5

services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -983,8 +983,9 @@ final class VirtualDeviceImpl extends IVirtualDevice.Stub 
        }

        }





        if (virtualDisplayWrapper == null) {

        if (virtualDisplayWrapper == null) {

            throw new IllegalStateException(

            Slog.w(TAG, "Virtual device " + mDeviceId + " doesn't have a virtual display with ID "

                    "Virtual device doesn't have a virtual display with ID " + displayId);

                    + displayId);

            return;

        }

        }





        final long ident = Binder.clearCallingIdentity();

        final long ident = Binder.clearCallingIdentity();

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java

+0 −7
Original line number Original line Diff line number Diff line
@@ -788,13 +788,6 @@ public class VirtualDeviceManagerServiceTest { 
                nullable(String.class), eq(DISPLAY_ID_1), eq(null));

                nullable(String.class), eq(DISPLAY_ID_1), eq(null));

    }

    }





    @Test

    public void onVirtualDisplayRemovedLocked_unknownDisplayId_throwsException() {

        final int unknownDisplayId = 999;

        assertThrows(IllegalStateException.class,

                () -> mDeviceImpl.onVirtualDisplayRemoved(unknownDisplayId));

    }



    @Test

    @Test

    public void onVirtualDisplayRemovedLocked_wakeLockIsReleased() throws RemoteException {

    public void onVirtualDisplayRemovedLocked_wakeLockIsReleased() throws RemoteException {

        addVirtualDisplay(mDeviceImpl, DISPLAY_ID_1);

        addVirtualDisplay(mDeviceImpl, DISPLAY_ID_1);