summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2012-03-21 11:00:32 -0700
committer Craig Mautner <cmautner@google.com> 2012-03-21 11:00:32 -0700
commit006f0e41abca961bade88908d7ef56ae63c429fb (patch)
tree4021bc1dd4aace8c0f4cac5af29b8be64ffc6646
parent6d332c514805798a9a545999e7f0d6d83a6a35d1 (diff)
Override not drawing to screen when screen is off.
A new test had been added to performDraw to provide an early return if the screen was off. Drawing should have proceeded however if mReportNextDraw is set. Otherwise views that turn on the screen (such as the alarm) are not shown. Fixes bug 6168158. Change-Id: If9013d9dbd39d60ee1de8aeb3e0c1facbc5a7db5
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4eb70ab17a70..14b8084c7eba 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1919,7 +1919,9 @@ public final class ViewRootImpl implements ViewParent,
}
private void performDraw() {
- if (!mAttachInfo.mScreenOn) return;
+ if (!mAttachInfo.mScreenOn && !mReportNextDraw) {
+ return;
+ }
final long drawStartTime;
if (ViewDebug.DEBUG_LATENCY) {