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

Commit ff371c2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null pointer judgment processing to prevent restarting" into main am: 29c8fea7 

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



Change-Id: Iaa971044146b3d6904bf9f755258418896895e4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cd318fb 29c8fea7

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

+1 −1
Original line number Diff line number Diff line
@@ -5748,7 +5748,7 @@ class Task extends TaskFragment { 
                false /* deferResume */);



        ActivityRecord topActivity = getDisplayArea().topRunningActivity();

        Task topRootTask = topActivity.getRootTask();

        Task topRootTask = topActivity == null ? null : topActivity.getRootTask();

        if (topRootTask != null && topRootTask != this && topActivity.isState(RESUMED)) {

            // Usually resuming a top activity triggers the next app transition, but nothing's got

            // resumed in this case, so we need to execute it explicitly.