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

Commit eb29627e authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev am: 1fee2046 

am: 163e7345

Change-Id: Ica7a566d83eec318c71e0f3470c8595169786a52
parents 2955daca 163e7345

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -13112,6 +13112,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            + " couldn't be found");

                    return null;

                }

                if (activity.app == null || activity.app.thread == null) {

                    Slog.w(TAG, "enqueueAssistContext failed: no process for " + activity);

                    return null;

                }

            }















            PendingAssistExtras pae;