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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2015-08-19 18:25:29 +00:00
committed by Android (Google) Code Review
parent 8b8fa3e934 865b79b43b
commit 29cd880890
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -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;

4
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -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.");