Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9

am: 47797a7653

* commit '47797a765327af3d3688b6993d85e727ddcf4aa0':
  Do not sanitize override config for fullscreen

Change-Id: Ib531f36a2526d4d7b2f3c09ece16ca0bb745447f

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

@@ -1582,6 +1582,11 @@ final class TaskRecord {
      * @param globalConfig global configuration to update from.
      */
     void sanitizeOverrideConfiguration(Configuration globalConfig) {
+        // If it's fullscreen, the override config should be empty and we should leave it alone.
+        if (mFullscreen) {
+            return;
+        }
+
         // screenLayout field is set in #calculateOverrideConfig but only part of it is really
         // overridden - aspect ratio and size. Other flags (like layout direction) can be updated
         // separately in global config and they also must be updated in override config.