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

2016-05-18 15:46:45 +00:00
parent f45bc095c6 16c91bd47f
commit 4e08800a7e
1 changed files with 2 additions and 6 deletions
--- a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java
@@ -334,12 +334,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
        setIntent(intent);
    }

-    @Override
-    protected void onStart() {
-        super.onStart();
-        updatePipUI();
-    }
-
    @Override
    public void onEnterAnimationComplete() {
        super.onEnterAnimationComplete();
@@ -391,6 +385,8 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener {
        } else {
            mTaskStackHorizontalGridView.setSelectedPosition(0);
        }
+
+        updatePipUI();
    }

    @Override