Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dumpsys: fix problems with -a option in battery and batteryinfo services"

Browse Source
This commit is contained in:
Mike Lockwood
2011-08-16 13:07:17 -07:00
committed by Android (Google) Code Review
parent f6e364e8c3 e81740442f
commit 92bebc3259
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/BatteryService.java
View File

@@ -498,7 +498,7 @@ class BatteryService extends Binder {
return; return;
} }
if (args == null || args.length == 0) { if (args == null || args.length == 0 || "-a".equals(args[0])) {
synchronized (this) { synchronized (this) {
pw.println("Current Battery Service state:"); pw.println("Current Battery Service state:");
pw.println(" AC powered: " + mAcOnline); pw.println(" AC powered: " + mAcOnline);

2
services/java/com/android/server/am/BatteryStatsService.java
View File

@@ -478,6 +478,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
} else if ("-h".equals(arg)) { } else if ("-h".equals(arg)) {
dumpHelp(pw); dumpHelp(pw);
return; return;
} else if ("-a".equals(arg)) {
// fall through
} else { } else {
pw.println("Unknown option: " + arg); pw.println("Unknown option: " + arg);
dumpHelp(pw); dumpHelp(pw);