Merge "Temporary NPE mitigation." into tm-dev

2022-04-05 01:45:12 +00:00
parent 2084cbb2c3 b1b99c28cf
commit 08009d5e02
1 changed files with 5 additions and 2 deletions
--- 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<InputDevice>();
-            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);
+                }
            }
        }
    }