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

Fix NPE when get organized taskFragment

Browse Source 
NPE happens occasionally during SST, Was not checking if parent
was null.

Bug: 199146679
Test: atest TaskFragmentOrganizerTest
      TaskFragmentOrganizerPolicyTest
Change-Id: I54dc4fc3c789d5c87fd1480906d6736106877e25
This commit is contained in:
Jeff Chang
2021-09-09 18:14:52 +08:00
parent 08774f2ffc
commit 262f671df8
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/TaskFragment.java
View File

@@ -441,7 +441,7 @@ class TaskFragment extends WindowContainer<WindowContainer> {
return this;
}
TaskFragment parentTaskFragment = getParent().asTaskFragment();
TaskFragment parentTaskFragment = getParent() != null ? getParent().asTaskFragment() : null;
return parentTaskFragment != null ? parentTaskFragment.getOrganizedTaskFragment() : null;
}