commit b900c94f20de89b02c144a1cb72a774638465a29
author Biswarup Pal <biswarupp@google.com> Wed Jan 17 13:52:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 17 13:52:51 2024 +0000
tree dc569b76b8e6c116597e7ba3ac3fe3cb2edbdfe6
parent 4b60fe723f6223a5ad6e880dc3d67d50721a9c69
parent 231e81113f6bb6c1d72f266a06ada0556ec71dc7

Merge "Fix case where VDM is not connected, ignore isVirtuaDevice(). Previous CL ag/25851197 doesn't consider case where VDM is not connected, so fixing it with this CL." into main

services/core/java/com/android/server/input/KeyboardLayoutManager.java

diff --git a/services/core/java/com/android/server/input/KeyboardLayoutManager.java b/services/core/java/com/android/server/input/KeyboardLayoutManager.java
index 6236e2b..46668de 100644
--- a/services/core/java/com/android/server/input/KeyboardLayoutManager.java
+++ b/services/core/java/com/android/server/input/KeyboardLayoutManager.java
@@ -1370,7 +1370,7 @@
     public boolean isVirtualDevice(int deviceId) {
         VirtualDeviceManagerInternal vdm = LocalServices.getService(
                 VirtualDeviceManagerInternal.class);
-        return vdm == null || vdm.isInputDeviceOwnedByVirtualDevice(deviceId);
+        return vdm != null && vdm.isInputDeviceOwnedByVirtualDevice(deviceId);
     }
 
     private static int[] getScriptCodes(@Nullable Locale locale) {