Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-10 13:06:16 +00:00
committed by Gerrit Code Review
parent a63eeff008 9cc9e483e0
commit 29c8fea778
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/Task.java
View File

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