commit 224a9c9b670967c566d4e6c38675550263605591
author Asmita Poddar <asmitapoddar@google.com> Mon Mar 20 14:05:13 2023 +0000
committer Asmita Poddar <asmitapoddar@google.com> Mon Mar 20 14:05:13 2023 +0000
tree bdf359a7c52458d0c047aa3486ddde368f9d303b
parent f1c8dabd9ece9a253dcf402faa581e93db8416ee

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

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