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

Commit 80167801 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Fixes testResumedWhenRecreatedFromInNonFocusedStack" into rvc-dev am: 0a79590d 

Change-Id: I8df9ee50a6f51b394d2d7817984a6e1b2f520c64
parents 96eb7512 0a79590d

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()) {