commit 26c8c42bbb2b998e609983886fad5968f033268d
author Jorim Jaggi <jjaggi@google.com> Mon May 09 19:57:25 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Fri May 13 16:00:50 2016 -0700
tree 2095d61788014f94270f077258b8be20c39f7c28
parent b35301e421bb08c28425c49ad46a277c96ccb411

Also freeze configuration when freezing bounds

We also need to freeze the override configuration so we don't report
the new configuration too early, which leads to bugs.

Bug: 27915587
Change-Id: Idffadbb02ab0311796caa760ae1f467fd2d17768

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

diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index abbb5f4..b773a4e 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -34,6 +34,7 @@
 
 import android.annotation.NonNull;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Message;
 import android.os.RemoteException;
@@ -133,6 +134,7 @@
     int mPendingRelaunchCount;
 
     ArrayDeque<Rect> mFrozenBounds = new ArrayDeque<>();
+    ArrayDeque<Configuration> mFrozenMergedConfig = new ArrayDeque<>();
 
     AppWindowToken(WindowManagerService _service, IApplicationToken _token,
             boolean _voiceInteraction) {
@@ -675,6 +677,16 @@
      */
     private void freezeBounds() {
         mFrozenBounds.offer(new Rect(mTask.mPreparedFrozenBounds));
+
+        if (mTask.mPreparedFrozenMergedConfig.equals(Configuration.EMPTY)) {
+            // We didn't call prepareFreezingBounds on the task, so use the current value.
+            final Configuration config = new Configuration(service.mCurConfiguration);
+            config.updateFrom(mTask.mOverrideConfig);
+            mFrozenMergedConfig.offer(config);
+        } else {
+            mFrozenMergedConfig.offer(new Configuration(mTask.mPreparedFrozenMergedConfig));
+        }
+        mTask.mPreparedFrozenMergedConfig.setToDefaults();
     }
 
     /**
@@ -682,6 +694,7 @@
      */
     private void unfreezeBounds() {
         mFrozenBounds.remove();
+        mFrozenMergedConfig.remove();
         for (int i = windows.size() - 1; i >= 0; i--) {
             final WindowState win = windows.get(i);
             if (!win.mHasSurface) {
@@ -747,6 +760,7 @@
         }
         if (!mFrozenBounds.isEmpty()) {
             pw.print(prefix); pw.print("mFrozenBounds="); pw.println(mFrozenBounds);
+            pw.print(prefix); pw.print("mFrozenMergedConfig="); pw.println(mFrozenMergedConfig);
         }
         if (mPendingRelaunchCount != 0) {
             pw.print(prefix); pw.print("mPendingRelaunchCount="); pw.println(mPendingRelaunchCount);