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

Commit f78016d9 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Attempted to fix NPE when report assistant context" into sc-dev am: 68a06ef9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c6f5404c11af87c1d17109d825caa421ee9e0b7
parents af72a5bd 68a06ef9

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

+7 −0
Original line number Diff line number Diff line
@@ -2457,6 +2457,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);