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

Commit 60fc3420 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6f3434d1f8fa54113aeb73af4d58459335299215
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 513fb855 8b0a1847

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