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

Prevent NPE when checking focused stage before root task is ready

Browse Source 
If the root task of the stage is not created, treat the stage as not
focused to prevent trowing NPE when traversing the root task and its
child.

Fix: 199060332
Test: manual check isFocused won't throw before root task is ready
Change-Id: I3869f934b641c8ffd77730452d0501d65063785c
This commit is contained in:
Jerry Chang
2021-09-07 09:02:44 +08:00
parent b96a5795fc
commit 553f62019b
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;
}