diff options
| author | Craig Mautner <cmautner@google.com> | 2012-11-20 18:21:12 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-11-21 13:19:39 -0800 |
| commit | 6edb6db512198aa0eef66341d163926b3531bca3 (patch) | |
| tree | 449ed687ab7cc79e1cc17aac0c0a33bfd473ce9d /core | |
| parent | 7b0c877959ee15c766cc7366ec6b4c024c211cd6 (diff) | |
| download | frameworks_base-6edb6db512198aa0eef66341d163926b3531bca3.zip frameworks_base-6edb6db512198aa0eef66341d163926b3531bca3.tar.gz frameworks_base-6edb6db512198aa0eef66341d163926b3531bca3.tar.bz2 | |
Ignore invalid combination of PowerManager flags.
ACQUIRE_CAUSES_WAKEUP is supposed to be ignored if combined with
PARTIAL_WAKE_LOCK. Instead it was being carried out for any values
of the WakeLock level.
This change reverts behavior to closely match
previous releases of the framework by only honoring
ACQUIRE_CAUSES_WAKEUP for screen wake lock levels. The only
difference being that in previous releases ACQUIRE_ could have been
combined with PROXIMITY_SCREEN_OFF_WAKE_LOCK (it never was) and
now such a combination will ignore the ACQUIRE_ flag.
Bug 7532258 fixed.
Change-Id: I46e848d8fd1b57e54c63141bf3d4f353986b5bdf
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/os/PowerManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 4a01113..736762f 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -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} |