Merge "Do not sanitize override config for fullscreen" into nyc-dev

am: 65f1973ba9

* commit '65f1973ba9f91c6727a7131b31b6c563cd880ee0':
  Do not sanitize override config for fullscreen

Change-Id: Ic9c62b12f529e17c39ac7f466433cb30cb13f356

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.