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

Commit 163e7345 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

Change-Id: I4a434ebd87377cf249274168f71d6eeb714cfe63
parents 0111667c 1fee2046

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

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

                            + " couldn't be found");

                    return null;

                    return null;

                }

                }

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

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

                    return null;

                }

            }

            }

















            PendingAssistExtras pae;







            PendingAssistExtras pae;