Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE by making Toast on UI thread" into udc-dev

Browse Source
This commit is contained in:
Louis Chang
2023-03-07 08:58:28 +00:00
committed by Android (Google) Code Review
parent 8ab1601f61 aa49c60bda
commit 8b0a18473b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/ActivityTaskSupervisor.java
View File

@@ -1729,14 +1729,11 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
} }
if (ActivitySecurityModelFeatureFlags.shouldShowToast(callingUid)) { if (ActivitySecurityModelFeatureFlags.shouldShowToast(callingUid)) {
Toast toast = Toast.makeText(mService.mContext, UiThread.getHandler().post(() -> Toast.makeText(mService.mContext,
(ActivitySecurityModelFeatureFlags.DOC_LINK (ActivitySecurityModelFeatureFlags.DOC_LINK
+ (restrictActivitySwitch + (restrictActivitySwitch ? " returned home due to "
? "returned home due to " : " would return home due to ")
: "would return home due to ") + callingLabel), Toast.LENGTH_LONG).show());
+ callingLabel),
Toast.LENGTH_LONG);
UiThread.getHandler().post(toast::show);
} }
// If the activity switch should be restricted, return home rather than the // If the activity switch should be restricted, return home rather than the