Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c34ecbb authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973b am: 47797a76" into nyc-mr1-dev-plus-aosp
am: 4f01d239

* commit '4f01d239':
  Do not sanitize override config for fullscreen

Change-Id: Icd5372ad1de5a023b095d93ba30e5887e052652e
parents c69822cf 4f01d239

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

+5 −0
Original line number Diff line number Diff line
@@ -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.