Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-31 13:53:52 +00:00
committed by Android (Google) Code Review
parent 40383d7977 45a6bab552
commit 88c874299e
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/virtual/VirtualDeviceImpl.java
View File

@@ -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();

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

@@ -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);