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

Commit 9184cb52 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix dismissing activity getting relaunch signal while dismissing split"... 

Merge "Fix dismissing activity getting relaunch signal while dismissing split" into sc-v2-dev am: a07f72ca

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

Change-Id: I4847074bce4cbb934853ca852ff434e96aa2d14e
parents b280e6c5 a07f72ca

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

+2 −8
Original line number Diff line number Diff line
@@ -1354,14 +1354,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                updatePictureInPictureMode(null, false);

            } else {

                mLastReportedMultiWindowMode = inMultiWindowMode;

                // 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 State state = getState();

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

                ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,

                            true /* ignoreVisibility */);

                }

                        false /* ignoreVisibility */);

            }

        }

    }