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 
am: 28d9c9f7b2

* commit '28d9c9f7b2498d5b81bdfbf6cabc955c4a2ecec9':
  PIP: Fix system UI crash

Change-Id: Ief778c79108ac6d2eb5e7b2406f9c6d1da6c8ca7
This commit is contained in:
Jaewan Kim
2016-04-21 16:31:42 +00:00
committed by android-build-merger
parent c3bd9dc93f 28d9c9f7b2
commit 552c5af941
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) {
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()) {