diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java | 6 |
1 files changed, 4 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 dd12360a0196..fe5d8bce1741 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,8 @@ public class PipRecentsOverlayManager { */ public void requestFocus(boolean allowRecentsFocusable) { mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE); - if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) { + if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent + || !mPipManager.isPipShown()) { return; } mIsPipFocusedInRecent = true; @@ -153,7 +154,8 @@ public class PipRecentsOverlayManager { * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}. */ public void clearFocus() { - if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) { + if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent + || !mPipManager.isPipShown()) { return; } if (!mRecentsView.hasFocus()) { |