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

am 66b0343e: am a8d9291d: Merge "Various battery info things:" into gingerbread

Browse Source 
Merge commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b'

* commit '66b0343e9e32203cdd39b854852cf575ca2fcd6b':
  Various battery info things:
This commit is contained in:
Dianne Hackborn
2010-08-16 15:17:46 -07:00
committed by Android Git Automerger
parent af4798d9c3 66b0343e9e
commit 0a56fdc140
13 changed files with 494 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -8085,12 +8085,12 @@ public class WindowManagerService extends IWindowManager.Stub
if (oldHold != newHold) {
try {
if (oldHold != null) {
mBatteryStats.noteStopWakelock(oldHold.mUid,
mBatteryStats.noteStopWakelock(oldHold.mUid, -1,
"window",
BatteryStats.WAKE_TYPE_WINDOW);
}
if (newHold != null) {
mBatteryStats.noteStartWakelock(newHold.mUid,
mBatteryStats.noteStartWakelock(newHold.mUid, -1,
"window",
BatteryStats.WAKE_TYPE_WINDOW);
}