summaryrefslogtreecommitdiffstats
path: root/policy/src/com
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-07-17 22:44:20 -0700
committerJeff Brown <jeffbrown@google.com>2014-07-18 21:56:08 -0700
commitf6d466895b74d620d646abbec1c8911f3a0ce0bb (patch)
tree1411bc110ac23d4baa62f44d73fa94681b8c258b /policy/src/com
parent5dc219142a756d57355b511c8f8ab913c01710da (diff)
downloadframeworks_base-f6d466895b74d620d646abbec1c8911f3a0ce0bb.zip
frameworks_base-f6d466895b74d620d646abbec1c8911f3a0ce0bb.tar.gz
frameworks_base-f6d466895b74d620d646abbec1c8911f3a0ce0bb.tar.bz2
Allow dreams to wake up gently.
This change adds a new DreamService.wakeUp() method to allow a dream to wake itself up gently and perform a transition before finally finishing. The power manager will ask a dream to wake up gently in most cases but may force it to happen immediately when necessary. If the dream takes too long to finish itself then the dream controller will douse it with water summarily after 5 seconds. Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
Diffstat (limited to 'policy/src/com')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index a3c84c6..ba4c588 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2179,7 +2179,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// If there's a dream running then use home to escape the dream
// but don't actually go home.
if (mDreamManagerInternal != null && mDreamManagerInternal.isDreaming()) {
- mDreamManagerInternal.stopDream();
+ mDreamManagerInternal.stopDream(false /*immediate*/);
return -1;
}