From e81740442f94aefe7dd3f061dfbd20a6fdeb667d Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 16 Aug 2011 12:53:43 -0700
Subject: [PATCH] dumpsys: fix problems with -a option in battery and
 batteryinfo services

Now the dumpsys battery output will show up in bugreports again.

Change-Id: Id36e87d27e9d3c06dcc17671c81aa1d3fe260d1e
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 services/java/com/android/server/BatteryService.java         | 2 +-
 services/java/com/android/server/am/BatteryStatsService.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java
index 1aff9a2b80d0d..ab9ae69b9945b 100644
--- a/services/java/com/android/server/BatteryService.java
+++ b/services/java/com/android/server/BatteryService.java
@@ -498,7 +498,7 @@ class BatteryService extends Binder {
             return;
         }
 
-        if (args == null || args.length == 0) {
+        if (args == null || args.length == 0 || "-a".equals(args[0])) {
             synchronized (this) {
                 pw.println("Current Battery Service state:");
                 pw.println("  AC powered: " + mAcOnline);
diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java
index 293702dfe750c..226723fbed6cb 100644
--- a/services/java/com/android/server/am/BatteryStatsService.java
+++ b/services/java/com/android/server/am/BatteryStatsService.java
@@ -478,6 +478,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
                 } else if ("-h".equals(arg)) {
                     dumpHelp(pw);
                     return;
+                } else if ("-a".equals(arg)) {
+                    // fall through
                 } else {
                     pw.println("Unknown option: " + arg);
                     dumpHelp(pw);