From 543a7589b1f92b768d4f5540d24d827bf931c460 Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Tue, 21 Nov 2023 06:03:54 +0000
Subject: [PATCH] [PK Setting] Add null check on
 NewKeyboardSettingUtils.getInputDevice()

return null if InputDeviceIdentifier is null in getInputDevice.

Test: n/a
Bug: 307109888
Change-Id: Ie2f951d97e0ff66833d74170e625fb0368d6de42
---
 .../android/settings/inputmethod/NewKeyboardSettingsUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java b/src/com/android/settings/inputmethod/NewKeyboardSettingsUtils.java
index bdbbbbc7865..f3dc0a3eef7 100644
--- 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,