commit 453b23398d4cad1d0eee8d6514dc6b82547ffc1e
author Craig Mautner <cmautner@google.com> Wed Jul 23 21:47:09 2014 -0700
committer The Android Automerger <android-build@google.com> Thu Jul 24 14:28:04 2014 -0700
tree 24f0a18b382d7bc332f5e7a21e5d69c540d17a9e
parent bbaccd6f11dcf3a9ac182754234aefea1d6a2c07

Refactor screen blocking logic.

Because of the call to turn on the screen introduced in ag/495255
is now made earlier we may not have sent the wakeup broadcast by
the time the windows have all drawn. In such a case onScreenOn()
did not release the wakelock and the screen stayed off.

This change ensures that no matter the timing of onScreenOn()
the wakelock will be released but only for the onScreenOn()
called in response to the most recent screen on transition.

Fixes bug 16404078.

Change-Id: Ic1e3e61e16c1fc34d4ec657e0e53ac49a05ca6a4