diff options
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 777ffe7c0b65..2167f67319fe 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -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, |