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

Commit 45e921f5 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: 2ae97b4c

* commit '2ae97b4c':
  Do not sanitize override config for fullscreen

Change-Id: I68c9388de4a43e8ae03f057b26e0a8caab48afa6
parents 4dbb79b9 2ae97b4c
Loading
Loading
Loading
Loading
+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.