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

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

Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev 

am: 4e08800a

* commit '4e08800a':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I6e8172d0a5fe6d6f12474b188b1e1ca52b927bfd
parents a83b4cfc 4e08800a

packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java

+2 −6
Original line number Original line Diff line number Diff line
@@ -334,12 +334,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { 
        setIntent(intent);

        setIntent(intent);

    }

    }





    @Override

    protected void onStart() {

        super.onStart();

        updatePipUI();

    }



    @Override

    @Override

    public void onEnterAnimationComplete() {

    public void onEnterAnimationComplete() {

        super.onEnterAnimationComplete();

        super.onEnterAnimationComplete();
@@ -391,6 +385,8 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { 
        } else {

        } else {

            mTaskStackHorizontalGridView.setSelectedPosition(0);

            mTaskStackHorizontalGridView.setSelectedPosition(0);

        }

        }



        updatePipUI();

    }

    }





    @Override

    @Override