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

Commit cd59ed76 authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Make onVirtualDisplayRemoved callback idempotent." into main

parents c62afc4f 502f5729

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

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



        if (virtualDisplayWrapper == null) {

            throw new IllegalStateException(

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

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

                    + displayId);

            return;

        }



        final long ident = Binder.clearCallingIdentity();

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

+0 −7
Original line number Diff line number Diff line
@@ -789,13 +789,6 @@ public class VirtualDeviceManagerServiceTest { 
                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

    public void onVirtualDisplayRemovedLocked_wakeLockIsReleased() throws RemoteException {

        addVirtualDisplay(mDeviceImpl, DISPLAY_ID_1);