Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a66523 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I14d270fe7e1b226a858cc1e465262e97024c1fc2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3788b00 08009d5e

core/java/android/hardware/input/InputManager.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -1421,11 +1421,14 @@ public final class InputManager { 
            }

            }





            mInputDevices = new SparseArray<InputDevice>();

            mInputDevices = new SparseArray<InputDevice>();

            // TODO(b/223905476): remove when the rootcause is fixed.

            if (ids != null) {

                for (int i = 0; i < ids.length; i++) {

                for (int i = 0; i < ids.length; i++) {

                    mInputDevices.put(ids[i], null);

                    mInputDevices.put(ids[i], null);

                }

                }

            }

            }

        }

        }

    }





    private void onInputDevicesChanged(int[] deviceIdAndGeneration) {

    private void onInputDevicesChanged(int[] deviceIdAndGeneration) {

        if (DEBUG) {

        if (DEBUG) {