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

Commit 2efd0acb authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge \"Added checks while unfreezing bounds\" into nyc-mr1-dev am:... 

Merge "Merge \"Added checks while unfreezing bounds\" into nyc-mr1-dev am: b59b5a67" into nyc-mr1-dev-plus-aosp
parents 246d1f88 2bd4866c

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

+9 −2
Original line number Diff line number Diff line
@@ -626,6 +626,9 @@ class AppWindowToken extends WindowToken { 
    }



    void clearRelaunching() {

        if (mPendingRelaunchCount == 0) {

            return;

        }

        if (canFreezeBounds()) {

            unfreezeBounds();

        }
@@ -711,8 +714,12 @@ class AppWindowToken extends WindowToken { 
     * Unfreezes the previously frozen bounds. See {@link #freezeBounds}.

     */

    private void unfreezeBounds() {

        if (!mFrozenBounds.isEmpty()) {

            mFrozenBounds.remove();

        }

        if (!mFrozenMergedConfig.isEmpty()) {

            mFrozenMergedConfig.remove();

        }

        for (int i = windows.size() - 1; i >= 0; i--) {

            final WindowState win = windows.get(i);

            if (!win.mHasSurface) {