Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb679c7c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use HwLight.type as the key of mLightsByType" am: ee4446c0 am:... 

Merge "Use HwLight.type as the key of mLightsByType" am: ee4446c0 am: 9b53553c am: afea9341 am: 81945db9 am: 63f53d58 am: 79bc5aa8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2198763



Change-Id: I35a04e145986174cd0d2ea261a7a14ce9ace9201
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f381154 79bc5aa8

services/core/java/com/android/server/lights/LightsService.java

+3 −2
Original line number Diff line number Diff line
@@ -468,9 +468,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;

            }

        }

    }