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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-07 03:35:16 +00:00
committed by Android (Google) Code Review
parent b24386ba3e 553f62019b
commit f64f48c526
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. */ /** @return {@code true} if this listener contains the currently focused task. */
boolean isFocused() { boolean isFocused() {
if (mRootTaskInfo.isFocused) return true; if (mRootTaskInfo == null) {
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) { return false;
if (mChildrenTaskInfo.valueAt(i).isFocused) return true;
} }
if (mRootTaskInfo.isFocused) {
return true;
}
for (int i = mChildrenTaskInfo.size() - 1; i >= 0; --i) {
if (mChildrenTaskInfo.valueAt(i).isFocused) {
return true;
}
}
return false; return false;
} }