summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-03-12 19:16:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-12 19:16:42 +0000
commit0575b185c618a79ede771389ed9a78436b5636bd (patch)
treed672a9a2b73df8fbb0847a07b4c7690343909472 /services
parent2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e (diff)
parente39ef098963df1c50912cfeb53c01868ad91a48b (diff)
downloadframeworks_base-0575b185c618a79ede771389ed9a78436b5636bd.zip
frameworks_base-0575b185c618a79ede771389ed9a78436b5636bd.tar.gz
frameworks_base-0575b185c618a79ede771389ed9a78436b5636bd.tar.bz2
Merge "Add a temporary hack to report screen on while dozing." into klp-modular-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/power/PowerManagerService.java7
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;
}
}