commit 5b1308f02d720808727af61863bd59c227d6fe02
author Ruben Brunk <rubenbrunk@google.com> Wed Jun 03 18:49:27 2015 -0700
committer Ruben Brunk <rubenbrunk@google.com> Thu Jun 04 16:41:11 2015 -0700
tree 97a391a6f64f98d55593401d4a1abbb0d76dc899
parent 6d2c363fd59af805380622ff7a3ce4c34975aab2

Add UI for camera + flashlight battery reporting.

Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09

core/java/android/os/BatteryStats.java

diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index 1f2ad5f..becd0c8 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -1940,6 +1940,15 @@
      */
     public abstract long getFlashlightOnCount(int which);
 
+    /**
+     * Returns the time in microseconds that the camera has been on while the device was
+     * running on battery.
+     *
+     * {@hide}
+     */
+    public abstract long getCameraOnTime(long elapsedRealtimeUs, int which);
+
+
     public static final int NETWORK_MOBILE_RX_DATA = 0;
     public static final int NETWORK_MOBILE_TX_DATA = 1;
     public static final int NETWORK_WIFI_RX_DATA = 2;
@@ -2735,6 +2744,9 @@
                     case OVERCOUNTED:
                         label = "over";
                         break;
+                    case CAMERA:
+                        label = "camera";
+                        break;
                     default:
                         label = "???";
                 }
@@ -3522,6 +3534,10 @@
                         pw.print(prefix); pw.print("    Over-counted: "); printmAh(pw, bs.totalPowerMah);
                         pw.println();
                         break;
+                    case CAMERA:
+                        pw.print(prefix); pw.print("    Camera: "); printmAh(pw, bs.totalPowerMah);
+                        pw.println();
+                        break;
                 }
             }
             pw.println();