commit ab7ad3898c91dfc2afe6e776917f96dc8a096a44
author Jorim Jaggi <jjaggi@google.com> Wed Oct 26 18:22:04 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Tue Nov 01 15:36:21 2016 -0700
tree 203ab0a60cfe7d226656c5a099577d8514c6be43
parent 73294b6cf79910dc688e5b62d673082a3dec773b

The big keyguard transition refactor (5/n)

Also save surface for the home task, so unlocking to the homescreen
is as fast as before. Note that originally it was not possible to
save surface for home task because of artifacts when clicking the
home button. However, we added logic since then to disallow save
surface if it's a different intent, which is the case when pressing
the home button.

Also consolidate some relayout for less overhead.

Bug: 32057734
Change-Id: I53ede527cb1ff438001d4023ee3740283ee302ee

services/core/java/com/android/server/am/KeyguardController.java

diff --git a/services/core/java/com/android/server/am/KeyguardController.java b/services/core/java/com/android/server/am/KeyguardController.java
index ddf9364..2c8a8aa 100644
--- a/services/core/java/com/android/server/am/KeyguardController.java
+++ b/services/core/java/com/android/server/am/KeyguardController.java
@@ -101,18 +101,23 @@
      */
     void keyguardGoingAway(int flags) {
         if (mKeyguardShowing) {
-            mKeyguardGoingAway = true;
-            mWindowManager.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY,
-                    false /* alwaysKeepCurrent */, convertTransitFlags(flags),
-                    false /* forceOverride */);
-            mWindowManager.keyguardGoingAway(flags);
-            mService.updateSleepIfNeededLocked();
+            mWindowManager.deferSurfaceLayout();
+            try {
+                mKeyguardGoingAway = true;
+                mWindowManager.prepareAppTransition(TRANSIT_KEYGUARD_GOING_AWAY,
+                        false /* alwaysKeepCurrent */, convertTransitFlags(flags),
+                        false /* forceOverride */);
+                mWindowManager.keyguardGoingAway(flags);
+                mService.updateSleepIfNeededLocked();
 
-            // Some stack visibility might change (e.g. docked stack)
-            mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
-            mWindowManager.executeAppTransition();
-            mService.applyVrModeIfNeededLocked(mStackSupervisor.getResumedActivityLocked(),
-                    true /* enable */);
+                // Some stack visibility might change (e.g. docked stack)
+                mStackSupervisor.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
+                mWindowManager.executeAppTransition();
+                mService.applyVrModeIfNeededLocked(mStackSupervisor.getResumedActivityLocked(),
+                        true /* enable */);
+            } finally {
+                mWindowManager.continueSurfaceLayout();
+            }
         }
     }
 

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index d0ecf09..534a3d2 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -2713,13 +2713,7 @@
             return false;
         }
 
-        Task task = getTask();
-        if (task == null || task.inHomeStack()) {
-            // Don't save surfaces for home stack apps. These usually resume and draw
-            // first frame very fast. Saving surfaces are mostly a waste of memory.
-            return false;
-        }
-
+        final Task task = getTask();
         final AppWindowToken taskTop = task.getTopVisibleAppToken();
         if (taskTop != null && taskTop != mAppToken) {
             // Don't save if the window is not the topmost window.