diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-12 19:19:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 19:19:12 +0000 |
| commit | 236e174a96e73e5ae189285d984e3091210c762b (patch) | |
| tree | 678afdd597e739067c698a322e6f7a24228a6b96 /services/core/java | |
| parent | 3ce589e59507193ce15a76fa135bf2efc7bca7c6 (diff) | |
| parent | 0575b185c618a79ede771389ed9a78436b5636bd (diff) | |
| download | frameworks_base-236e174a96e73e5ae189285d984e3091210c762b.zip frameworks_base-236e174a96e73e5ae189285d984e3091210c762b.tar.gz frameworks_base-236e174a96e73e5ae189285d984e3091210c762b.tar.bz2 | |
am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '0575b185c618a79ede771389ed9a78436b5636bd':
Add a temporary hack to report screen on while dozing.
Diffstat (limited to 'services/core/java')
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 159268c..c251af1 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -1805,7 +1805,12 @@ public final class PowerManagerService extends com.android.server.SystemService private boolean isScreenOnInternal() { synchronized (mLock) { - return isScreenOnLocked(); + // XXX This is a temporary hack to let certain parts of the system pretend the + // screen is still on even when dozing and we would normally want to report + // screen off. Will be removed when the window manager is modified to use + // the true blanking state of the display. + return isScreenOnLocked() + || mWakefulness == WAKEFULNESS_DOZING; } } |