From 5613979215481f36f6e12d27da1e737a308ca524 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Sat, 29 Oct 2022 15:25:00 -0700 Subject: [PATCH] Don't warn for displays with no input device matching. Creating a virtual display via the public APIs prevents from using the @hide VIRTUAL_DISPLAY_FLAG_SUPPORTS_TOUCH flag in createVirtualDisplay. Not passing this flag results in viewport DisplayDeviceInfo.TOUCH_NONE, i.e. the input system will not be dispatching to it. This results in a warning being logged for a valid per public API contract case. Test: No warning logs for displays with no input device matching. Upstream from Meta. Change-Id: I0d4386542a85cdf4c6322d934338dbde4ae2bb10 --- .../com/android/server/display/DisplayManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java index d3e2966c6df0b..510e04caa1120 100644 --- a/services/core/java/com/android/server/display/DisplayManagerService.java +++ b/services/core/java/com/android/server/display/DisplayManagerService.java @@ -2218,7 +2218,9 @@ public final class DisplayManagerService extends SystemService { } // fallthrough default: - Slog.w(TAG, "Display " + info + " does not support input device matching."); + if (DEBUG) { + Slog.w(TAG, "Display " + info + " does not support input device matching."); + } } return Optional.empty(); }