diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 3d204ea7962f1..d9b71bdf411bf 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -1423,8 +1423,11 @@ public final class InputManager { } mInputDevices = new SparseArray(); - for (int i = 0; i < ids.length; i++) { - mInputDevices.put(ids[i], null); + // TODO(b/223905476): remove when the rootcause is fixed. + if (ids != null) { + for (int i = 0; i < ids.length; i++) { + mInputDevices.put(ids[i], null); + } } } }