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

Commit 385b604a authored by Jeff Chang's avatar Jeff Chang
Browse files

Attempted to fix NPE when report assistant context 

Bug: 177073014
Test: Launch the assistant application

Change-Id: I0ff3cdc8ffea13b593c7b43bb8fded9e1a92b114
parent 258ae119

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

+7 −0
Original line number Diff line number Diff line
@@ -2458,6 +2458,13 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            if (referrer != null) {

                pae.extras.putParcelable(Intent.EXTRA_REFERRER, referrer);

            }

            if (!pae.activity.isAttached()) {

                // Skip directly because the caller activity may have been destroyed. If a caller

                // is waiting for the assist data, it will be notified by timeout

                // (see PendingAssistExtras#run()) and then pendingAssistExtrasTimedOut will clean

                // up the request.

                return;

            }

            if (structure != null) {

                // Pre-fill the task/activity component for all assist data receivers

                structure.setTaskId(pae.activity.getTask().mTaskId);