diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-04-05 01:45:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-04-05 01:45:12 +0000 |
| commit | 08009d5e02ac54e26e9337851b821972667906b7 (patch) | |
| tree | 696d3ee0127027edb0c909af9a27fb0bda826cdb /core/java/android | |
| parent | 2084cbb2c36b329743faa3a2d4dfa8887e832d47 (diff) | |
| parent | b1b99c28cf2d7d1b83bd1c2f59665b5a276284b2 (diff) | |
Merge "Temporary NPE mitigation." into tm-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/input/InputManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index c38a847dfb9f..cc5b275bbf5a 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<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); + } } } } |