From a205547d8b586896697502fb0bc16ba4b5312a32 Mon Sep 17 00:00:00 2001
From: Jacqueline Bronger <bronger@google.com>
Date: Wed, 30 Jun 2021 14:38:36 +0000
Subject: [PATCH] Fix NPE in TvPipController

Test: atest android.accessibilityservice.cts.AccessibilityWindowReportingTest#putWindowInPictureInPicture_generatesEventAndReportsProperty
Bug: 189418438
Change-Id: I28e5eb78dcade1c83ee53ed88bee84834e618615
---
 .../Shell/src/com/android/wm/shell/pip/tv/TvPipController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java
index 70980191f103e..a2e9b64046fd2 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipController.java
@@ -279,7 +279,7 @@ public class TvPipController implements PipTransitionController.PipTransitionCal
     private void checkIfPinnedTaskAppeared() {
         final TaskInfo pinnedTask = getPinnedTaskInfo();
         if (DEBUG) Log.d(TAG, "checkIfPinnedTaskAppeared(), task=" + pinnedTask);
-        if (pinnedTask == null) return;
+        if (pinnedTask == null || pinnedTask.topActivity == null) return;
         mPinnedTaskId = pinnedTask.taskId;
         setState(STATE_PIP);