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

Commit d4f8783b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-5c568a4d5fce4fe88f1d10f881151264" into tm-qpr-dev-plus-aosp 

* changes:
  [automerge] [RESTRICT AUTOMERGE] Always set last report configuration for starting window. 2p: b6b58615
  [RESTRICT AUTOMERGE] Always set last report configuration for starting window.
parents 60323752 33190e17

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

+4 −0
Original line number Original line 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

        // 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

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

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

        // 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

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

                || mAttrs.type == TYPE_APPLICATION_STARTING

                || mActivityRecord.isVisibleRequested()))) {

                || mActivityRecord.isVisibleRequested()))) {

            final Configuration globalConfig = getProcessGlobalConfiguration();

            final Configuration globalConfig = getProcessGlobalConfiguration();

            final Configuration overrideConfig = getMergedOverrideConfiguration();

            final Configuration overrideConfig = getMergedOverrideConfiguration();