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

Commit 3884ae87 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e3 

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

Change-Id: Ifab02f6f178bc587717434c704ce5edcab5014b2
parents 3a55ef5c 1dbee3e3

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

+5 −0
Original line number Diff line number Diff line
@@ -1685,6 +1685,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        final NeededUriGrants resultGrants = collectGrants(resultData, r.resultTo);



        synchronized (mGlobalLock) {

            // Sanity check in case activity was removed before entering global lock.

            if (!r.isInHistory()) {

                return true;

            }



            // Keep track of the root activity of the task before we finish it

            final Task tr = r.getTask();

            final ActivityRecord rootR = tr.getRootActivity();