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

Commit 25cdf2b2 authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Automerger Merge Worker
Browse files

Merge "Do not remove toast window token without removing window" into udc-dev... 

Merge "Do not remove toast window token without removing window" into udc-dev am: 32352058 am: 6d0d5d09

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



Change-Id: If108cce4e2c31dd33c1eb0475428b6f3a6e9a802
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da5bbd69 6d0d5d09

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −7
Original line number Diff line number Diff line
@@ -8712,13 +8712,7 @@ public class NotificationManagerService extends SystemService { 














        ToastRecord lastToast = mToastQueue.remove(index);



























        mWindowManagerInternal.removeWindowToken(lastToast.windowToken, false /* removeWindows */,













                lastToast.displayId);













        // We passed 'false' for 'removeWindows' so that the client has time to stop













        // rendering (as hide above is a one-way message), otherwise we could crash













        // a client which was actively using a surface made from the token. However













        // we need to schedule a timeout to make sure the token is eventually killed













        // one way or another.













        // We need to schedule a timeout to make sure the token is eventually killed















        scheduleKillTokenTimeout(lastToast);





























        keepProcessAliveForToastIfNeededLocked(record.pid);