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

Commit bb3af587 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only consider to keep activity config if invisible requested" into... 

Merge "Only consider to keep activity config if invisible requested" into tm-qpr-dev am: 38657089 am: bfc5bb40

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



Change-Id: If9ced02bd69084761039793c0353ba70b4f2f2fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdf02585 bfc5bb40

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

+2 −2
Original line number Diff line number Diff line
@@ -3868,8 +3868,8 @@ 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}.

        if (useLatestConfig || (relayoutVisible && (!shouldCheckTokenVisibleRequested()

                || mToken.isVisibleRequested()))) {

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

                || mActivityRecord.mVisibleRequested))) {

            final Configuration globalConfig = getProcessGlobalConfiguration();

            final Configuration overrideConfig = getMergedOverrideConfiguration();

            outMergedConfiguration.setConfiguration(globalConfig, overrideConfig);

services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java

+6 −0
Original line number Diff line number Diff line
@@ -217,6 +217,12 @@ public class WindowManagerServiceTests extends WindowTestsBase { 
        mWm.relayoutWindow(win.mSession, win.mClient, win.mAttrs, w, h, View.VISIBLE, 0, 0, 0,

                outFrames, outConfig, outSurfaceControl, outInsetsState, outControls, outBundle);

        assertEquals(0, outConfig.getMergedConfiguration().densityDpi);

        // Non activity window can still get the last config.

        win.mActivityRecord = null;

        win.fillClientWindowFramesAndConfiguration(outFrames, outConfig,

                false /* useLatestConfig */, true /* relayoutVisible */);

        assertEquals(win.getConfiguration().densityDpi,

                outConfig.getMergedConfiguration().densityDpi);

    }



    @Test