commit c32f084b70816b5e4f02396d606b1050e2860532
author Sooraj Sasindran <sasindran@google.com> Fri Apr 27 09:34:17 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Apr 27 09:34:17 2018 -0700
tree 7f61825d4fb764fd829c0f7a21fb1bf88b91eca6
parent 9d5f657bbfcdb2bc768deeec6059ce98f5073911
parent 8828fd1266262e108ca710e6451597e20c1b59e2

Merge "Make batterystats logging readable" into pi-dev am: 36a2324a92
am: 8828fd1266

Change-Id: Ic81d28df2e6c6ec32b6ada4710f23287a13e0314

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 120b86d..e3d2690 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1444,6 +1444,8 @@
                SEC_TO_MSEC(10));
     RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),
                SEC_TO_MSEC(10));
+    RunDumpsys("BATTERYSTATS", {"batterystats"}, CommandOptions::WithTimeout(90).Build(),
+               SEC_TO_MSEC(10));
 
     printf("========================================================\n");
     printf("== Running Application Services\n");
@@ -1452,12 +1454,6 @@
     RunDumpsys("TELEPHONY SERVICES", {"activity", "service", "TelephonyDebugService"});
 
     printf("========================================================\n");
-    printf("== Checkins\n");
-    printf("========================================================\n");
-
-    RunDumpsys("CHECKIN BATTERYSTATS", {"batterystats", "-c"});
-
-    printf("========================================================\n");
     printf("== dumpstate: done (id %d)\n", ds.id_);
     printf("========================================================\n");
 }