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

Commit 035aa948 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Fix activity does not relaunch after config change." into rvc-dev

parents 4e0f10c1 cdf51038

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);