Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 am: e2a0c9437c

am: c448cf3af4

* commit 'c448cf3af4ae10fc9775862f452f1cdab9743440':
  Fix exception when trying to update config of detached stack

Change-Id: Ia576bafce0270a304939d0b273343283dd76d110

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

@@ -381,6 +381,11 @@ public class TaskStack implements DimLayer.DimLayerUser,
     }
 
     private boolean updateBoundsAfterConfigChange() {
+        if (mDisplayContent == null) {
+            // If the stack is already detached we're not updating anything,
+            // as it's going away soon anyway.
+            return false;
+        }
         final int newRotation = getDisplayInfo().rotation;
         final int newDensity = getDisplayInfo().logicalDensityDpi;