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

Merge "Fix NPE if display is off and then removed" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-04-15 14:48:41 +00:00
committed by Android (Google) Code Review
parent 476d1d4558 31e9ca615b
commit ed94e99260
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/TaskSnapshotController.java
View File

@@ -646,8 +646,12 @@ class TaskSnapshotController {
if (shouldDisableSnapshots()) {
return;
}
final DisplayContent displayContent = mService.mRoot.getDisplayContent(displayId);
if (displayContent == null) {
return;
}
mTmpTasks.clear();
mService.mRoot.getDisplayContent(displayId).forAllTasks(task -> {
displayContent.forAllTasks(task -> {
// Since RecentsAnimation will handle task snapshot while switching apps with the best
// capture timing (e.g. IME window capture), No need additional task capture while task
// is controlled by RecentsAnimation.