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

Commit 8cfba905 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Do not associate staring window to task for rotation change" into udc-qpr-dev

parents 2e5ca19d 038b6893

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

+2 −0
Original line number Diff line number Diff line
@@ -2334,6 +2334,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            mDisplayContent.updateImeControlTarget(isImeLayeringTarget() /* updateImeParent */);

            // Fix the starting window to task when Activity has changed.

            if (mStartingData != null && mStartingData.mAssociatedTask == null

                    && mTempConfiguration.windowConfiguration.getRotation()

                            == selfConfiguration.windowConfiguration.getRotation()

                    && !mTempConfiguration.windowConfiguration.getBounds().equals(getBounds())) {

                mStartingData.mResizedFromTransfer = true;

                // Lock the starting window to task, so it won't resize from transfer anymore.

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

+3 −0
Original line number Diff line number Diff line
@@ -2939,6 +2939,9 @@ public class ActivityRecordTests extends WindowTestsBase { 
        // transform to activity1.

        int rotation = (mDisplayContent.getRotation() + 1) % 4;

        mDisplayContent.setFixedRotationLaunchingApp(activity, rotation);

        // The configuration with rotation change should not trigger task-association.

        assertNotNull(activity.mStartingData);

        assertNull(activity.mStartingData.mAssociatedTask);

        doReturn(rotation).when(mDisplayContent)

                .rotationForActivityInDifferentOrientation(topActivity);