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

Commit bbd38e5f 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... 

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

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



Change-Id: I36024b2619fe46a24c09939174246f581c74d2f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9fa71686 2eb144eb

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

+1 −1
Original line number Diff line number Diff line
@@ -5717,7 +5717,7 @@ class Task extends TaskFragment { 
            }

        }

        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.