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

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

Merge "[RESTRICT AUTOMERGE] Always set last report configuration for starting...

Merge "[RESTRICT AUTOMERGE] Always set last report configuration for starting window." into tm-qpr-dev
parents 6535b8e2 b6b58615
Loading
Loading
Loading
Loading
+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();