drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7f2a9896: Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev

Browse Source 
* commit '7f2a98967532138f3f962216ccf2d1a8307d42de':
  Ignore invalid combination of PowerManager flags.
This commit is contained in:
Craig Mautner
2012-11-26 11:41:17 -08:00
committed by Android Git Automerger
parent b4a6398769 7f2a989675
commit 8de91ce1e0
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/PowerManager.java
View File

@ -182,6 +182,8 @@ public final class PowerManager {
* </p><p>
* Since not all devices have proximity sensors, use {@link #isWakeLockLevelSupported}
* to determine whether this wake lock level is supported.
* </p><p>
* Cannot be used with {@link #ACQUIRE_CAUSES_WAKEUP}.
* </p>
*
* {@hide}

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

@ -618,8 +618,19 @@ public final class PowerManagerService extends IPowerManager.Stub
}
}
private static boolean isScreenLock(final WakeLock wakeLock) {
switch (wakeLock.mFlags & PowerManager.WAKE_LOCK_LEVEL_MASK) {
case PowerManager.FULL_WAKE_LOCK:
case PowerManager.SCREEN_BRIGHT_WAKE_LOCK:
case PowerManager.SCREEN_DIM_WAKE_LOCK:
return true;
}
return false;
}
private void applyWakeLockFlagsOnAcquireLocked(WakeLock wakeLock) {
if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0) {
if ((wakeLock.mFlags & PowerManager.ACQUIRE_CAUSES_WAKEUP) != 0 &&
isScreenLock(wakeLock)) {
wakeUpNoUpdateLocked(SystemClock.uptimeMillis());
}
}