diff options
| author | 2023-06-15 17:45:41 +0000 | |
|---|---|---|
| committer | 2023-06-15 17:45:41 +0000 | |
| commit | 3d547361bb9e581ba12ca5b5ce0f60d56f36fea3 (patch) | |
| tree | 49fc1768bc0d0fdcb5a770739e23c84eb3be41d1 | |
| parent | 5e8062916cf1ce3f05d9c3ba60045e2353f8b21e (diff) | |
| parent | 323520588742d7cf2b40e96ad3741d8222092ff2 (diff) | |
Merge "Do not remove toast window token without removing window" into udc-dev am: 3235205887
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23659622
Change-Id: I9865114b46315813ebda119188995447aa6add82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index d29d9c84501d..488745c6ea97 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -8718,13 +8718,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); |