diff options
2 files changed, 3 insertions, 9 deletions
diff --git a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java index 51acfd362677..402fbb812812 100644 --- a/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java +++ b/services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java @@ -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(); diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java index e6b12693c5e4..4512cc025bf0 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java @@ -790,13 +790,6 @@ public class VirtualDeviceManagerServiceTest { } @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); ArgumentCaptor<IBinder> wakeLockCaptor = ArgumentCaptor.forClass(IBinder.class); |