Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bebc32 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

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

parents f6e364e8 e8174044

services/java/com/android/server/BatteryService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

services/java/com/android/server/am/BatteryStatsService.java

+2 −0
Original line number Diff line number Diff line
@@ -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);