Merge "Temporary NPE mitigation." into tm-dev am: 08009d5e02 am: f7a66523ae

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17571865

Change-Id: Ia43426a2739c1145df4a6daa9ce482a697e8cfda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-05 02:04:00 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}
}
}
}