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

Commit 3e563635 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 

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



Change-Id: Ic13760a5489c519bc92bb64297f933cdd3c731d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d901f1e2 f9c9cb7d

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) {