From b1b99c28cf2d7d1b83bd1c2f59665b5a276284b2 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Mon, 4 Apr 2022 13:14:37 -0700 Subject: [PATCH] Temporary NPE mitigation. To unblock failing presubmit. The team is working on the real fix. Bug: 223905476 Test: presubmit Change-Id: I713eac26f375ced798c9d02a47841645e39c907e --- core/java/android/hardware/input/InputManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index c38a847dfb9f8..cc5b275bbf5ab 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -1421,8 +1421,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); + } } } }