diff options
Diffstat (limited to 'services/java/com/android/server/am/BatteryStatsService.java')
-rw-r--r-- | services/java/com/android/server/am/BatteryStatsService.java | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/services/java/com/android/server/am/BatteryStatsService.java b/services/java/com/android/server/am/BatteryStatsService.java index 27d0401292e5..9ba1198d4f6c 100644 --- a/services/java/com/android/server/am/BatteryStatsService.java +++ b/services/java/com/android/server/am/BatteryStatsService.java @@ -70,13 +70,15 @@ public final class BatteryStatsService extends IBatteryStats.Stub { public byte[] getStatistics() { mContext.enforceCallingPermission( android.Manifest.permission.BATTERY_STATS, null); - //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; + 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; + } } public void noteStartWakelock(int uid, String name, int type) { @@ -135,20 +137,6 @@ 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(); } |