Merge "Fix NPE when get organized taskFragment" into sc-v2-dev (bed9cb17) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/TaskFragment.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -447,7 +447,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;
		}