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

Commit f779323d 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

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

Change-Id: Ibe1d0311f47d7b4d5cfbcd68522839cdc3dff182
parents d6a0dbe9 c89faed0

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
@@ -3315,6 +3315,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() {