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

am 737d2c0b: Merge "Ignore ON_AFTER_RELEASE for partial wake locks." into klp-dev

Browse Source 
* commit '737d2c0b92b69d9069de6fe0e2785676b9a10d78':
  Ignore ON_AFTER_RELEASE for partial wake locks.
This commit is contained in:
Jeff Brown
2013-09-12 09:16:57 -07:00
committed by Android Git Automerger
parent 0b5fa44b24 737d2c0b92
commit a090866557
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/power/PowerManagerService.java
View File

@@ -650,8 +650,8 @@ public final class PowerManagerService extends IPowerManager.Stub
}
private void applyWakeLockFlagsOnAcquireLocked(WakeLock wakeLock) {
if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0 &&
isScreenLock(wakeLock)) {
if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0
&& isScreenLock(wakeLock)) {
wakeUpNoUpdateLocked(SystemClock.uptimeMillis());
}
}
@@ -725,7 +725,8 @@ public final class PowerManagerService extends IPowerManager.Stub
}
private void applyWakeLockFlagsOnReleaseLocked(WakeLock wakeLock) {
if ((wakeLock.mFlags & PowerManager.ON_AFTER_RELEASE) != 0) {
if ((wakeLock.mFlags & PowerManager.ON_AFTER_RELEASE) != 0
&& isScreenLock(wakeLock)) {
userActivityNoUpdateLocked(SystemClock.uptimeMillis(),
PowerManager.USER_ACTIVITY_EVENT_OTHER,
PowerManager.USER_ACTIVITY_FLAG_NO_CHANGE_LIGHTS,