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

Commit 3160fb16 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix leakage of DisplayContent referenced from TransitionController"... 

Merge "Fix leakage of DisplayContent referenced from TransitionController" into sc-v2-dev am: c89faed0 am: f779323d

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

Change-Id: I0f3ff1c86613fe472dcaa4d95ac1dbae5357ca78
parents 5ffaa0f9 f779323d

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

+0 −2
Original line number Diff line number Diff line
@@ -1050,8 +1050,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 


        mAppTransition = new AppTransition(mWmService.mContext, mWmService, this);

        mAppTransition.registerListenerLocked(mWmService.mActivityManagerAppTransitionNotifier);

        mTransitionController.registerLegacyListener(

                mWmService.mActivityManagerAppTransitionNotifier);

        mAppTransition.registerListenerLocked(mFixedRotationTransitionListener);

        mAppTransitionController = new AppTransitionController(mWmService, this);

        mUnknownAppVisibilityController = new UnknownAppVisibilityController(mWmService, this);

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

+1 −0
Original line number Diff line number Diff line
@@ -2851,6 +2851,7 @@ public class DisplayPolicy { 
    }



    void release() {

        mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener);

        mHandler.post(mGestureNavigationSettingsObserver::unregister);

        mImmersiveModeConfirmation.release();

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -462,6 +462,10 @@ class TransitionController { 
        mLegacyListeners.add(listener);

    }



    void unregisterLegacyListener(WindowManagerInternal.AppTransitionListener listener) {

        mLegacyListeners.remove(listener);

    }



    void dispatchLegacyAppTransitionPending() {

        for (int i = 0; i < mLegacyListeners.size(); ++i) {

            mLegacyListeners.get(i).onAppTransitionPendingLocked();

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

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 


    void setWindowManager(WindowManagerService wms) {

        mTransitionController = new TransitionController(mService, wms.mTaskSnapshotController);

        mTransitionController.registerLegacyListener(wms.mActivityManagerAppTransitionNotifier);

    }



    TransitionController getTransitionController() {