From 1a6d98bfd493022b85aab882f6be681ed612c6d8 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Mon, 8 Jan 2018 16:23:00 +0100
Subject: [PATCH] Make sure updateSurfaceSize gets applied after changing
 config

Otherwise we'll apply the old size.

Test: Rotate screen, make sure size is correct.
Test: go/wm-smoke
Change-Id: Ic9474952801241a16c344175104ec2b5d45e7ec8
---
 services/core/java/com/android/server/wm/TaskStack.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index eb8eae1a95d7d..7b4281c61f129 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -716,10 +716,11 @@ public class TaskStack extends WindowContainer<Task> implements
     @Override
     public void onConfigurationChanged(Configuration newParentConfig) {
         final int prevWindowingMode = getWindowingMode();
+        super.onConfigurationChanged(newParentConfig);
+
         // Only need to update surface size here since the super method will handle updating
         // surface position.
         updateSurfaceSize(getPendingTransaction());
-        super.onConfigurationChanged(newParentConfig);
         final int windowingMode = getWindowingMode();
 
         if (mDisplayContent == null || prevWindowingMode == windowingMode) {