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

Merge "Prevent NPE when checking focused stage before root task is ready" into sc-v2-dev am: f64f48c526 am: 8b3210fae8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15771370

Change-Id: I765d8bb5695b685c2ca164fe757c376be9ed1a93
This commit is contained in:
TreeHugger Robot
2021-09-07 04:07:21 +00:00
committed by Automerger Merge Worker
parent 8b5d5fa88c 8b3210fae8
commit 807ad5174c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java
View File

@@ -113,10 +113,20 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener {
/** @return {@code true} if this listener contains the currently focused task. */
boolean isFocused() {
if (mRootTaskInfo.isFocused) return true;
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {
if (mChildrenTaskInfo.valueAt(i).isFocused) return true;
if (mRootTaskInfo == null) {
return false;
}
if (mRootTaskInfo.isFocused) {
return true;
}
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {
if (mChildrenTaskInfo.valueAt(i).isFocused) {
return true;
}
}
return false;
}