Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ibe1d0311f47d7b4d5cfbcd68522839cdc3dff182
This commit is contained in:
Riddle Hsu
2022-01-19 05:16:22 +00:00
committed by Automerger Merge Worker
parent d6a0dbe9a4 c89faed0bd
commit f779323d35
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1067,8 +1067,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
mAppTransition = new AppTransition(mWmService.mContext, mWmService, this); mAppTransition = new AppTransition(mWmService.mContext, mWmService, this);
mAppTransition.registerListenerLocked(mWmService.mActivityManagerAppTransitionNotifier); mAppTransition.registerListenerLocked(mWmService.mActivityManagerAppTransitionNotifier);
mTransitionController.registerLegacyListener(
mWmService.mActivityManagerAppTransitionNotifier);
mAppTransition.registerListenerLocked(mFixedRotationTransitionListener); mAppTransition.registerListenerLocked(mFixedRotationTransitionListener);
mAppTransitionController = new AppTransitionController(mWmService, this); mAppTransitionController = new AppTransitionController(mWmService, this);
mUnknownAppVisibilityController = new UnknownAppVisibilityController(mWmService, this); mUnknownAppVisibilityController = new UnknownAppVisibilityController(mWmService, this);

1
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -3315,6 +3315,7 @@ public class DisplayPolicy {
} }
void release() { void release() {
mDisplayContent.mTransitionController.unregisterLegacyListener(mAppTransitionListener);
mHandler.post(mGestureNavigationSettingsObserver::unregister); mHandler.post(mGestureNavigationSettingsObserver::unregister);
} }

4
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -430,6 +430,10 @@ class TransitionController {
mLegacyListeners.add(listener); mLegacyListeners.add(listener);
} }
void unregisterLegacyListener(WindowManagerInternal.AppTransitionListener listener) {
mLegacyListeners.remove(listener);
}
void dispatchLegacyAppTransitionPending() { void dispatchLegacyAppTransitionPending() {
for (int i = 0; i < mLegacyListeners.size(); ++i) { for (int i = 0; i < mLegacyListeners.size(); ++i) {
mLegacyListeners.get(i).onAppTransitionPendingLocked(); mLegacyListeners.get(i).onAppTransitionPendingLocked();

1
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -137,6 +137,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
void setWindowManager(WindowManagerService wms) { void setWindowManager(WindowManagerService wms) {
mTransitionController = new TransitionController(mService, wms.mTaskSnapshotController); mTransitionController = new TransitionController(mService, wms.mTaskSnapshotController);
mTransitionController.registerLegacyListener(wms.mActivityManagerAppTransitionNotifier);
} }
TransitionController getTransitionController() { TransitionController getTransitionController() {