lights: Really make sure the lights are out

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

Change-Id: I12d8d31b2e1650762eb09ed46d90150c2e5dd97b

diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
index a3579e9..5d4ad11 100644 (file)
--- 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;