am c1c53e5: Merge "Fix dream/keyguard infinite layout loop." into jb-mr1-dev

* commit 'c1c53e56fb5222bfdd17f0a9f735efe5c1b8cb70':
  Fix dream/keyguard infinite layout loop.

Author: Jeff Brown

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -2965,10 +2965,11 @@ public void applyPostLayoutPolicyLw(WindowState win,
             boolean applyWindow = attrs.type >= FIRST_APPLICATION_WINDOW
                     && attrs.type <= LAST_APPLICATION_WINDOW;
             if (attrs.type == TYPE_DREAM) {
-                mShowingDream = true;
-                if (!mDreamingLockscreen) {
-                    applyWindow = true;
-                } else if (win.isVisibleLw() && win.hasDrawnLw()) {
+                // If the lockscreen was showing when the dream started then wait
+                // for the dream to draw before hiding the lockscreen.
+                if (!mDreamingLockscreen
+                        || (win.isVisibleLw() && win.hasDrawnLw())) {
+                    mShowingDream = true;
                     applyWindow = true;
                 }
             }
@@ -3008,8 +3009,10 @@ public int finishPostLayoutPolicyLw() {
                 ? mTopFullscreenOpaqueWindowState.getAttrs()
                 : null;
 
-        // If we are not currently showing a dream, then update the lockscreen
-        // state that will apply if a dream is shown next time.
+        // If we are not currently showing a dream then remember the current
+        // lockscreen state.  We will use this to determine whether the dream
+        // started while the lockscreen was showing and remember this state
+        // while the dream is showing.
         if (!mShowingDream) {
             mDreamingLockscreen = mShowingLockscreen;
         }