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

Commit aaa36ac8 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: 3d547361 am: b8ab273b

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



Change-Id: Ie56b0af2f7f683f022b2f2390c4ce37a9ba4b85e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1369d0ac b8ab273b

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

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
















        ToastRecord lastToast = mToastQueue.remove(index);







        ToastRecord lastToast = mToastQueue.remove(index);



























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







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











                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.














        scheduleKillTokenTimeout(lastToast);







        scheduleKillTokenTimeout(lastToast);



























        keepProcessAliveForToastIfNeededLocked(record.pid);







        keepProcessAliveForToastIfNeededLocked(record.pid);