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

Commit c89faed0 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Fix leakage of DisplayContent referenced from TransitionController" into sc-v2-dev

parents f2d1f344 491914c1

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

+0 −2
Original line number Diff line number Diff line
@@ -1067,8 +1067,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
@@ -3311,6 +3311,7 @@ public class DisplayPolicy { 
    }



    void release() {

        mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener);

        mHandler.post(mGestureNavigationSettingsObserver::unregister);

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -430,6 +430,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
@@ -137,6 +137,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 


    void setWindowManager(WindowManagerService wms) {

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

        mTransitionController.registerLegacyListener(wms.mActivityManagerAppTransitionNotifier);

    }



    TransitionController getTransitionController() {