auto import from //depot/cupcake/@137055

1 files changed, 21 insertions, 9 deletions

diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java
index 9ba1198d4f6c..27d0401292e5 100644
--- a/services/java/com/android/server/am/BatteryStatsService.java
+++ b/services/java/com/android/server/am/BatteryStatsService.java
@@ -70,15 +70,13 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
     public byte[] getStatistics() {
         mContext.enforceCallingPermission(
                 android.Manifest.permission.BATTERY_STATS, null);
-        synchronized (mStats) {
-            //Log.i("foo", "SENDING BATTERY INFO:");
-            //mStats.dumpLocked(new LogPrinter(Log.INFO, "foo"));
-            Parcel out = Parcel.obtain();
-            mStats.writeToParcel(out, 0);
-            byte[] data = out.marshall();
-            out.recycle();
-            return data;
-        }
+        //Log.i("foo", "SENDING BATTERY INFO:");
+        //mStats.dumpLocked(new LogPrinter(Log.INFO, "foo"));
+        Parcel out = Parcel.obtain();
+        mStats.writeToParcel(out, 0);
+        byte[] data = out.marshall();
+        out.recycle();
+        return data;
     }
     
     public void noteStartWakelock(int uid, String name, int type) {
@@ -137,6 +135,20 @@ public final class BatteryStatsService extends IBatteryStats.Stub {
         }
     }
 
+    public void notePhoneOn() {
+        enforceCallingPermission();
+        synchronized (mStats) {
+            mStats.notePhoneOnLocked();
+        }
+    }
+    
+    public void notePhoneOff() {
+        enforceCallingPermission();
+        synchronized (mStats) {
+            mStats.notePhoneOffLocked();
+        }
+    }
+
     public boolean isOnBattery() {
         return mStats.isOnBattery();
     }