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

Unverified Commit fff567ad authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

lights: Really make sure the lights are out 

 * Fix mismerge which didn't consider the additional condition.

Change-Id: I12d8d31b2e1650762eb09ed46d90150c2e5dd97b
parent 2d1fa4bc

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class LightsService extends SystemService { 


        private void setLightLocked(int color, int mode, int onMS, int offMS, int brightnessMode) {

            if (!mLocked && (mModesUpdate || color != mColor || mode != mMode || onMS != mOnMS ||

                    offMS != mOffMS || mBrightnessMode != brightnessMode)) {

                    offMS != mOffMS || mBrightnessMode != brightnessMode || mReset)) {

                if (DEBUG) Slog.v(TAG, "setLight #" + mId + ": color=#"

                        + Integer.toHexString(color) + ": brightnessMode=" + brightnessMode);

                mLastColor = mColor;