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

Commit 915160c8 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Fix EmbeddedWindow leaked when client binder death" into main am: f9c9cb7d am: 3e563635 

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



Change-Id: Icb93ed3b23d476beec3962213916aff90ad28d73
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59f515ed 3e563635

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

+3 −1
Original line number Diff line number Diff line
@@ -77,12 +77,14 @@ class EmbeddedWindowController { 
            mWindows.put(inputToken, window);

            final InputTransferToken inputTransferToken = window.getInputTransferToken();

            mWindowsByInputTransferToken.put(inputTransferToken, window);

            mWindowsByWindowToken.put(window.getWindowToken(), window);

            final IBinder windowToken = window.getWindowToken();

            mWindowsByWindowToken.put(windowToken, window);

            updateProcessController(window);

            window.mClient.linkToDeath(()-> {

                synchronized (mGlobalLock) {

                    mWindows.remove(inputToken);

                    mWindowsByInputTransferToken.remove(inputTransferToken);

                    mWindowsByWindowToken.remove(windowToken);

                }

            }, 0);

        } catch (RemoteException e) {