Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d13d8b6a authored by Jaewan Kim's avatar Jaewan Kim Committed by android-build-merger
Browse files

Merge "PIP: Fix system UI crash" into nyc-dev am: 28d9c9f7 am: a7932ad2 

am: 35cb0d48

* commit '35cb0d48':
  PIP: Fix system UI crash

Change-Id: I8a5a98ff317ff45469601817fad40618ae2e875d
parents aacc2834 35cb0d48

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

+2 −2
Original line number Diff line number Diff line
@@ -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()) {