summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/BatteryService.java
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2013-07-30 20:33:27 -0700
committerTodd Poynor <toddpoynor@google.com>2013-08-07 18:33:12 +0000
commitdf89ca3308544cfdd1ca12b22eac4a1d16e04410 (patch)
treeaaff0262790fd74889eb206e0e328c16a6f225f8 /services/java/com/android/server/BatteryService.java
parent9a04435e5fb7c5869d81184736c97097e24fd881 (diff)
batteryservice: add battery current now and charge counter data
Available for retrieval via future APIs if desired. Dumped by dumpsys. Not added to batterystats or ACTION_BATTERY_CHANGED intents at this point. Also fixes a formatting problem in the existing dumpsys output for voltage. Change-Id: I5320b19035914256fb872c13095c09c648dd522a
Diffstat (limited to 'services/java/com/android/server/BatteryService.java')
-rw-r--r--services/java/com/android/server/BatteryService.java13
1 files changed, 12 insertions, 1 deletions
diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 457539f88a0e..5f3f894ca68e 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -314,6 +314,8 @@ public final class BatteryService extends Binder {
+ ", batteryLevel=" + mBatteryProps.batteryLevel
+ ", batteryTechnology=" + mBatteryProps.batteryTechnology
+ ", batteryVoltage=" + mBatteryProps.batteryVoltage
+ + ", batteryCurrentNow=" + mBatteryProps.batteryCurrentNow
+ + ", batteryChargeCounter=" + mBatteryProps.batteryChargeCounter
+ ", batteryTemperature=" + mBatteryProps.batteryTemperature
+ ", mBatteryLevelCritical=" + mBatteryLevelCritical
+ ", mPlugType=" + mPlugType);
@@ -613,7 +615,16 @@ public final class BatteryService extends Binder {
pw.println(" present: " + mBatteryProps.batteryPresent);
pw.println(" level: " + mBatteryProps.batteryLevel);
pw.println(" scale: " + BATTERY_SCALE);
- pw.println(" voltage:" + mBatteryProps.batteryVoltage);
+ pw.println(" voltage: " + mBatteryProps.batteryVoltage);
+
+ if (mBatteryProps.batteryCurrentNow != Integer.MIN_VALUE) {
+ pw.println(" current now: " + mBatteryProps.batteryCurrentNow);
+ }
+
+ if (mBatteryProps.batteryChargeCounter != Integer.MIN_VALUE) {
+ pw.println(" charge counter: " + mBatteryProps.batteryChargeCounter);
+ }
+
pw.println(" temperature: " + mBatteryProps.batteryTemperature);
pw.println(" technology: " + mBatteryProps.batteryTechnology);
} else if (args.length == 3 && "set".equals(args[0])) {