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

Commit d2aa2287 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix NPE by making Toast on UI thread" into udc-dev am: 8b0a1847 am: 60fc3420"

parents 9d1fe83a 4d6f4500

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+4 −7
Original line number Diff line number Diff line
@@ -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 "

                            + (restrictActivitySwitch ? " returned home due to "

                                    : " would return home due to ")

                            + callingLabel),

                    Toast.LENGTH_LONG);

            UiThread.getHandler().post(toast::show);

                            + callingLabel), Toast.LENGTH_LONG).show());

        }



        // If the activity switch should be restricted, return home rather than the