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

am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

Browse Source 
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp

* commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b':
  Some battery improvements:
This commit is contained in:
Dianne Hackborn
2010-09-20 16:34:45 -07:00
committed by Android Git Automerger
parent ee63215903 8e1b84e765
commit 4b187e804f
5 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -1384,7 +1384,7 @@ public final class ActivityManagerService extends ActivityManagerNative
mBatteryStatsService = new BatteryStatsService(new File(
systemDir, "batterystats.bin").toString());
mBatteryStatsService.getActiveStatistics().readLocked();
mBatteryStatsService.getActiveStatistics().writeLocked();
mBatteryStatsService.getActiveStatistics().writeAsyncLocked();
mOnBattery = mBatteryStatsService.getActiveStatistics().getIsOnBattery();
mBatteryStatsService.getActiveStatistics().setCallback(this);
@@ -1537,7 +1537,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (mLastWriteTime < (now-BATTERY_STATS_TIME)) {
mLastWriteTime = now;
mBatteryStatsService.getActiveStatistics().writeLocked();
mBatteryStatsService.getActiveStatistics().writeAsyncLocked();
}
}
}