From fe6f335b638f73d2bb2d343c938a6fa4e0e2eb4d Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Thu, 21 Apr 2016 16:22:48 +0900
Subject: [PATCH] PIP: Fix system UI crash

Bug: 28306480
Change-Id: Ie36f73c46f3ee8d6a2cb8264458cb0e0410aaecd
---
 .../com/android/systemui/tv/pip/PipRecentsOverlayManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
index 5ad0bf6782305..dd12360a01969 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
@@ -134,7 +134,7 @@ public class PipRecentsOverlayManager {
      */
     public void requestFocus(boolean allowRecentsFocusable) {
         mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE);
-        if (!mIsRecentsShown || mIsPipFocusedInRecent) {
+        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) {
             return;
         }
         mIsPipFocusedInRecent = true;
@@ -153,7 +153,7 @@ public class PipRecentsOverlayManager {
      * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}.
      */
     public void clearFocus() {
-        if (!mIsRecentsShown || !mIsPipFocusedInRecent) {
+        if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) {
             return;
         }
         if (!mRecentsView.hasFocus()) {