From aa49c60bda615ffcb97c57ab5d71b1f47e74eca8 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 7 Mar 2023 05:45:22 +0000 Subject: Fix NPE by making Toast on UI thread Bug: 271453748 Test: AppTaskTests Change-Id: I14b3a93951254de75516c343dfd3420b3ed407a8 --- .../java/com/android/server/wm/ActivityTaskSupervisor.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java index df471c56fec9..710c4af56dd1 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java +++ b/services/core/java/com/android/server/wm/ActivityTaskSupervisor.java @@ -1729,14 +1729,11 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { } if (ActivitySecurityModelFeatureFlags.shouldShowToast(callingUid)) { - Toast toast = Toast.makeText(mService.mContext, + UiThread.getHandler().post(() -> Toast.makeText(mService.mContext, (ActivitySecurityModelFeatureFlags.DOC_LINK - + (restrictActivitySwitch - ? "returned home due to " - : "would return home due to ") - + callingLabel), - Toast.LENGTH_LONG); - UiThread.getHandler().post(toast::show); + + (restrictActivitySwitch ? " returned home due to " + : " would return home due to ") + + callingLabel), Toast.LENGTH_LONG).show()); } // If the activity switch should be restricted, return home rather than the -- cgit v1.2.3-59-g8ed1b