Merge "Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev am:... (8d6be961) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1146,7 +1146,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener,
	public void setPipVisibility(boolean visible) {		public void setPipVisibility(boolean visible) {
	ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,		ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
	"setPipVisibility: %s, state=%s visible=%s",		"setPipVisibility: %s, state=%s visible=%s",
	mTaskInfo.topActivity, mPipTransitionState, visible);		(mTaskInfo != null ? mTaskInfo.topActivity : null), mPipTransitionState, visible);
	if (!isInPip()) {		if (!isInPip()) {
	return;		return;
	}		}