summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-11-20 18:21:12 -0800
committerCraig Mautner <cmautner@google.com>2012-11-21 13:19:39 -0800
commit6edb6db512198aa0eef66341d163926b3531bca3 (patch)
tree449ed687ab7cc79e1cc17aac0c0a33bfd473ce9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7b0c877959ee15c766cc7366ec6b4c024c211cd6 (diff)
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 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions