Commit 9b30785f authored Sep 09, 2025 by Dorin Drimus

Fix NPE from ClipboardService using VDM

Apps that run on the default device and request the clipboard from a
virtual device will fallback to the default device clipboard (and not
crash the ClipboardService).
Considered returning DEVICE_ID_INVALID if the requested virtual device
doesn't share the clipboard with the default context, but preferred to align with the next case where the fallback deviceId is the deviceId of the app that requested the clipboard (which for the case is the default).

Bug: 443849134
Test: atest ClipboardManagerTest ClipboardManagerListenerTest StreamedAppClipboardTest
Flag: EXEMPT BUGFIX
Change-Id: I862c7c5a020edcf8b98b6e3966ca549151bd29d3

parent d5437349

services/core/java/com/android/server/clipboard/ClipboardService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -468,6 +468,12 @@ public class ClipboardService extends SystemService {
		return clipboardDeviceId;
		}

		// The app is running on the default device, even if it requests access to some virtual
		// device clipboard, fallback to the default clipboard.
		if (virtualDeviceIds.isEmpty()) {
		return DEVICE_ID_DEFAULT;
		}

		// Fallback to the device where the app is running, unless it uses the default clipboard.
		int fallbackDeviceId = virtualDeviceIds.valueAt(0);
		return deviceUsesDefaultClipboard(fallbackDeviceId) ? DEVICE_ID_DEFAULT : fallbackDeviceId;