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

Commit 01b46e1e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix activity does not relaunch after config change." into rvc-dev am: 035aa948 

Change-Id: Ib5b767bf8b65e6232eb9d86722e2f3728336b252
parents 1b4515c0 035aa948

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

+2 −10
Original line number Diff line number Diff line
@@ -356,8 +356,7 @@ class ActivityStack extends Task { 
            final PooledFunction f = PooledLambda.obtainFunction(

                    EnsureVisibleActivitiesConfigHelper::processActivity, this,

                    PooledLambda.__(ActivityRecord.class));

            forAllActivities(f, start.getTask(), true /*includeBoundary*/,

                    true /*traverseTopToBottom*/);

            forAllActivities(f, start, true /*includeBoundary*/, true /*traverseTopToBottom*/);

            f.recycle();



            if (mUpdateConfig) {
@@ -3945,15 +3944,8 @@ class ActivityStack extends Task { 
        proto.write(MIN_HEIGHT, mMinHeight);



        proto.write(FILLS_PARENT, matchParentBounds());

        getRawBounds().dumpDebug(proto, BOUNDS);



        if (!matchParentBounds()) {

            final Rect bounds = getRequestedOverrideBounds();

            bounds.dumpDebug(proto, BOUNDS);

        } else if (getStack().getTile() != null) {

            // use tile's bounds here for cts.

            final Rect bounds = getStack().getTile().getRequestedOverrideBounds();

            bounds.dumpDebug(proto, BOUNDS);

        }

        getOverrideDisplayedBounds().dumpDebug(proto, DISPLAYED_BOUNDS);

        if (mLastNonFullscreenBounds != null) {

            mLastNonFullscreenBounds.dumpDebug(proto, LAST_NON_FULLSCREEN_BOUNDS);