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

Commit 29c8fea7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add null pointer judgment processing to prevent restarting" into main

parents a63eeff0 9cc9e483

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

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

                false /* deferResume */);





        ActivityRecord topActivity = getDisplayArea().topRunningActivity();

        ActivityRecord topActivity = getDisplayArea().topRunningActivity();

        Task topRootTask = topActivity.getRootTask();

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

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

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

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

            // 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.

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