From 224a9c9b670967c566d4e6c38675550263605591 Mon Sep 17 00:00:00 2001
From: Asmita Poddar <asmitapoddar@google.com>
Date: Mon, 20 Mar 2023 14:05:13 +0000
Subject: [PATCH] Guarded access using mMotionRanges for LightsManager

Add guarded access using mMotionRanges for
getLightsManager() function

Bug: b/267758905
Test: Pre-submit
Change-Id: Ib138f0a178a56f024b897ed970308c89a765bae8
---
 core/java/android/view/InputDevice.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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