summaryrefslogtreecommitdiffstats
path: root/services/core/java
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2014-02-10 12:50:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-10 12:50:24 +0000
commit694a022cb613424261a9753250e1c9a20955a4cf (patch)
tree761be6b2fa6ce2b66d9fbaf46dc0723584d20d55 /services/core/java
parenta0ab96d1a757b737fd816ae2b4d24bf6127a09b5 (diff)
parent9e07c1c4f333171bff6e1cf1c4408e5738bcf127 (diff)
downloadframeworks_base-694a022cb613424261a9753250e1c9a20955a4cf.zip
frameworks_base-694a022cb613424261a9753250e1c9a20955a4cf.tar.gz
frameworks_base-694a022cb613424261a9753250e1c9a20955a4cf.tar.bz2
am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '9e07c1c4f333171bff6e1cf1c4408e5738bcf127': Make sure to turn off led after pulse()
Diffstat (limited to 'services/core/java')
-rw-r--r--services/core/java/com/android/server/lights/LightsService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
index 62dc090..3d22370 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -78,6 +78,7 @@ public class LightsService extends SystemService {
synchronized (this) {
if (mColor == 0 && !mFlashing) {
setLightLocked(color, LIGHT_FLASH_HARDWARE, onMS, 1000, BRIGHTNESS_MODE_USER);
+ mColor = 0;
mH.sendMessageDelayed(Message.obtain(mH, 1, this), onMS);
}
}