From 17fc027210fdb248c1af115b824688b3c2194e5f Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 19 Sep 2016 10:34:42 -0700 Subject: [PATCH 1/1] lights: Really make sure the lights are out * Fix mismerge which didn't consider the additional condition. Change-Id: I12d8d31b2e1650762eb09ed46d90150c2e5dd97b --- services/core/java/com/android/server/lights/LightsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java index a3579e95d37d..5d4ad116e9ae 100644 --- a/services/core/java/com/android/server/lights/LightsService.java +++ b/services/core/java/com/android/server/lights/LightsService.java @@ -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; -- 2.11.0