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

Commit 33190e17 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] [RESTRICT AUTOMERGE] Always set last report configuration for... 

[automerge] [RESTRICT AUTOMERGE] Always set last report configuration for starting window. 2p: b6b58615

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22901260

Bug: 276356396
Change-Id: I241d59a2bbd1590750b0240f6f50042803d9a46c
parents 08f866f9 b6b58615

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

+4 −0
Original line number Diff line number Diff line
@@ -3867,7 +3867,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        // configuration update when the window has requested to be hidden. Doing so can lead to

        // the client erroneously accepting a configuration that would have otherwise caused an

        // activity restart. We instead hand back the last reported {@link MergedConfiguration}.

        // Also note since starting window isn't a window of activity, it won't make activity

        // restart, so here should allow starting window to set the last reported configuration

        // during relayout, which could happen before activity request visible.

        if (useLatestConfig || (relayoutVisible && (mActivityRecord == null

                || mAttrs.type == TYPE_APPLICATION_STARTING

                || mActivityRecord.isVisibleRequested()))) {

            final Configuration globalConfig = getProcessGlobalConfiguration();

            final Configuration overrideConfig = getMergedOverrideConfiguration();