Merge "Use HwLight.type as the key of mLightsByType"

2023-06-19 09:44:58 +00:00
parent 540962a60a f74fde1975
commit ee4446c09e
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -465,9 +465,10 @@ public class LightsService extends SystemService {
        }

        for (int i = mLightsById.size() - 1; i >= 0; i--) {
-            final int type = mLightsById.keyAt(i);
+            LightImpl light = mLightsById.valueAt(i);
+            final int type = light.mHwLight.type;
            if (0 <= type && type < mLightsByType.length) {
-                mLightsByType[type] = mLightsById.valueAt(i);
+                mLightsByType[type] = light;
            }
        }
    }