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

Commit 29cd8808 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev

parents 8b8fa3e9 865b79b4

core/java/com/android/internal/os/BatteryStatsImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.net.ConnectivityManager; 
import android.net.NetworkStats;

import android.net.wifi.WifiActivityEnergyInfo;

import android.net.wifi.WifiManager;

import android.os.BadParcelableException;

import android.os.BatteryManager;

import android.os.BatteryStats;

import android.os.Build;

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

+3 −1
Original line number Diff line number Diff line
@@ -975,7 +975,9 @@ public final class BatteryStatsService extends IBatteryStats.Stub 
        pw.println("Battery stats (batterystats) dump options:");

        pw.println("  [--checkin] [--history] [--history-start] [--charged] [-c]");

        pw.println("  [--daily] [--reset] [--write] [--new-daily] [--read-daily] [-h] [<package.name>]");

        pw.println("  --checkin: format output for a checkin report.");

        pw.println("  --checkin: generate output for a checkin report; will write (and clear) the");

        pw.println("             last old completed stats when they had been reset.");

        pw.println("  --c: write the current stats in checkin format.");

        pw.println("  --history: show only history data.");

        pw.println("  --history-start <num>: show only history data starting at given time offset.");

        pw.println("  --charged: only output data since last charged.");