summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorDiogo Ferreira <diogo@underdev.org>2016-11-04 17:48:30 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-04 10:56:08 -0700
commitce521ee7de0bf1264abe0cd399f59e505ff28005 (patch)
treebd7d1dfcbc109998e6505c5313c5fd3fd426d99a /services/core
parent2d6cf0cd4d52a074a4f09b564531145e48776ace (diff)
downloadframeworks_base-ce521ee7de0bf1264abe0cd399f59e505ff28005.zip
frameworks_base-ce521ee7de0bf1264abe0cd399f59e505ff28005.tar.gz
frameworks_base-ce521ee7de0bf1264abe0cd399f59e505ff28005.tar.bz2
services: battery: Don't blink with an hvdcp charger
Quick charging doesn't really turn the device into a ticking time bomb so there is no use in frantically blinking the led while charging. This is a partial revert of the lights changes in a qualcomm commit (ec43b6d83). Change-Id: I42fdaa4a0af1bfa96c598b4209cbe9936d0de35d Ticket: MARMITE-441
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/BatteryService.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index 839ba6e..fa48d6c 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -1123,14 +1123,8 @@ public final class BatteryService extends SystemService {
// Battery is full or charging and nearly full
mBatteryLight.setColor(mBatteryFullARGB);
} else {
- if (isHvdcpPresent()) {
- // Blinking orange if HVDCP charger
- mBatteryLight.setFlashing(mBatteryMediumARGB, Light.LIGHT_FLASH_TIMED,
- mBatteryLedOn, mBatteryLedOn);
- } else {
- // Battery is charging and halfway full
- mBatteryLight.setColor(mBatteryMediumARGB);
- }
+ // Battery is charging and halfway full
+ mBatteryLight.setColor(mBatteryMediumARGB);
}
} else {
// No lights if not charging and not low