diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-12 22:57:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 22:57:52 +0000 |
| commit | 088a997defe5ac88d10c341af277bceb7c46f479 (patch) | |
| tree | 19c9624e6e4cda73a4491a7795f5d6da68abf944 /services | |
| parent | de69575dd1bdafabda8afda8b4251b830ba0c551 (diff) | |
| parent | 81cc19cf18dff969319c7d1ded4f285394e37aab (diff) | |
| download | frameworks_base-088a997defe5ac88d10c341af277bceb7c46f479.zip frameworks_base-088a997defe5ac88d10c341af277bceb7c46f479.tar.gz frameworks_base-088a997defe5ac88d10c341af277bceb7c46f479.tar.bz2 | |
am 81cc19cf: am 236e174a: am 0575b185: Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
* commit '81cc19cf18dff969319c7d1ded4f285394e37aab':
Add a temporary hack to report screen on while dozing.
Diffstat (limited to 'services')
| -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 e0a46b9..fab972f 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -1816,7 +1816,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; } } |