Merge "[PK Setting] Add null check on NewKeyboardSettingUtils.getInputDevice()" into main

2023-11-22 08:11:10 +00:00
parent 28bbbf783b 543a7589b1
commit fd45d6576f
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
+++ b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
@@ -110,7 +110,8 @@ public class NewKeyboardSettingsUtils {
    }

    static InputDevice getInputDevice(InputManager im, InputDeviceIdentifier identifier) {
-        return im.getInputDeviceByDescriptor(identifier.getDescriptor());
+        return identifier == null ? null : im.getInputDeviceByDescriptor(
+                identifier.getDescriptor());
    }

    static KeyboardLayout[] getKeyboardLayouts(InputManager inputManager, int userId,