diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index 9225cd908c172..61864d776cab1 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -1183,8 +1183,10 @@ public final class InputDevice implements Parcelable { */ @NonNull public LightsManager getLightsManager() { - if (mLightsManager == null) { - mLightsManager = InputManager.getInstance().getInputDeviceLightsManager(mId); + synchronized (mMotionRanges) { + if (mLightsManager == null) { + mLightsManager = InputManager.getInstance().getInputDeviceLightsManager(mId); + } } return mLightsManager; }