Merge "Fix NPE in TaskView." (cbb25bcf) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -252,7 +252,9 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,
		mTaskOrganizer.setInterceptBackPressedOnTaskRoot(mTaskToken, true);
		// TODO: Synchronize show with the resize
		onLocationChanged();
		if (taskInfo.taskDescription != null) {
		setResizeBackgroundColor(taskInfo.taskDescription.getBackgroundColor());
		}

		if (mListener != null) {
		mListenerExecutor.execute(() -> {
		@@ -279,9 +281,10 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback,

		@Override
		public void onTaskInfoChanged(ActivityManager.RunningTaskInfo taskInfo) {
		mTaskInfo.taskDescription = taskInfo.taskDescription;
		if (taskInfo.taskDescription != null) {
		setResizeBackgroundColor(taskInfo.taskDescription.getBackgroundColor());
		}
		}

		@Override
		public void onBackPressedOnTaskRoot(ActivityManager.RunningTaskInfo taskInfo) {