commit 6bbd3e99e3501916c119f768094ec557434c8b20
author Asmita Poddar <asmitapoddar@google.com> Mon Mar 20 16:21:55 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 20 16:21:55 2023 +0000
tree 94a02c79d09a2bdecfba684adca1facc1ba81e89
parent 90de0634206cc8e9101f203f7c79a62f6f040a83
parent 224a9c9b670967c566d4e6c38675550263605591

Merge "Guarded access using mMotionRanges for LightsManager" into udc-dev

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