Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PIP: Fix system UI crash" into nyc-dev

Browse Source
This commit is contained in:
Youngsang Cho
2016-04-21 16:23:00 +00:00
committed by Android (Google) Code Review
parent d3589ee715 fe6f335b63
commit 28d9c9f7b2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java
View File

@@ -134,7 +134,7 @@ public class PipRecentsOverlayManager {
*/ */
public void requestFocus(boolean allowRecentsFocusable) { public void requestFocus(boolean allowRecentsFocusable) {
mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE); mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE);
if (!mIsRecentsShown || mIsPipFocusedInRecent) { if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent) {
return; return;
} }
mIsPipFocusedInRecent = true; mIsPipFocusedInRecent = true;
@@ -153,7 +153,7 @@ public class PipRecentsOverlayManager {
* This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}. * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}.
*/ */
public void clearFocus() { public void clearFocus() {
if (!mIsRecentsShown || !mIsPipFocusedInRecent) { if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent) {
return; return;
} }
if (!mRecentsView.hasFocus()) { if (!mRecentsView.hasFocus()) {