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

Commit 290ef34c authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Fixes testResumedWhenRecreatedFromInNonFocusedStack 

If the activity is in stopping or stopped state, for instance, it's in
split screen task and not the top one, the last configuration it should
keep is the one before multi-window mode change.

Bug: 155691588
Test: atest --iteration 5 ActivityLifecycleSplitScreenTests
Change-Id: I95e469798fe67ff75abef33b5e515a09c7e4731c
parent 4775628d

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

+8 −2
Original line number Diff line number Diff line
@@ -1160,11 +1160,17 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            } else {

                mLastReportedMultiWindowMode = inMultiWindowMode;

                computeConfigurationAfterMultiWindowModeChange();

                // If the activity is in stopping or stopped state, for instance, it's in the

                // split screen task and not the top one, the last configuration it should keep

                // is the one before multi-window mode change.

                final ActivityState state = getState();

                if (state != STOPPED && state != STOPPING) {

                    ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,

                            true /* ignoreVisibility */);

                }

            }

        }

    }



    void updatePictureInPictureMode(Rect targetStackBounds, boolean forceUpdate) {

        if (task == null || task.getStack() == null || !attachedToProcess()) {