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

Commit 819c5c70 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Automerger Merge Worker
Browse files

Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev am: 050f26ee am: 2a5ccc71 

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



Change-Id: I058875b63f33fc786352f9418f9c1c220d4dff95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ab3dfa6 2a5ccc71

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

+7 −22
Original line number Diff line number Diff line
@@ -4516,7 +4516,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    mTransitionChangeFlags |= FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;

                }

                // Post cleanup after the visibility and animation are transferred.

                fromActivity.postWindowRemoveStartingWindowCleanup(tStartingWindow);

                fromActivity.postWindowRemoveStartingWindowCleanup();

                fromActivity.mVisibleSetFromTransferredStartingWindow = false;



                mWmService.updateFocusedWindowLocked(
@@ -7443,28 +7443,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

    }



    void postWindowRemoveStartingWindowCleanup(WindowState win) {

        // TODO: Something smells about the code below...Is there a better way?

        if (mStartingWindow == win) {

            ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Notify removed startingWindow %s", win);

            removeStartingWindow();

        } else if (mChildren.size() == 0) {

            // If this is the last window and we had requested a starting transition window,

            // well there is no point now.

            ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Nulling last startingData");

            mStartingData = null;

            if (mVisibleSetFromTransferredStartingWindow) {

    void postWindowRemoveStartingWindowCleanup() {

        if (mChildren.size() == 0 && mVisibleSetFromTransferredStartingWindow) {

            // We set the visible state to true for the token from a transferred starting

            // window. We now reset it back to false since the starting window was the last

            // window in the token.

            setVisible(false);

        }

        } else if (mChildren.size() == 1 && mStartingSurface != null && !isRelaunching()) {

            // If this is the last window except for a starting transition window,

            // we need to get rid of the starting transition.

            ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Last window, removing starting window %s", win);

            removeStartingWindow();

        }

    }



    void requestUpdateWallpaperIfNeeded() {

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

+1 −1
Original line number Diff line number Diff line
@@ -1996,7 +1996,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        if (win.mActivityRecord != null) {

            win.mActivityRecord.postWindowRemoveStartingWindowCleanup(win);

            win.mActivityRecord.postWindowRemoveStartingWindowCleanup();

        }



        if (win.mAttrs.type == TYPE_WALLPAPER) {