From 16c91bd47f1ed378441adc89cde69b161562e3b3 Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Wed, 18 May 2016 10:02:45 +0900
Subject: [PATCH] PIP: Fix NPE when enters Recents with PIP

Bug: 28826021
Change-Id: Ic81f705dccbd4b334ed5a26345fdc5fee23f5a68
---
 .../android/systemui/recents/tv/RecentsTvActivity.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java
index 5bb5091fb342c..4341ab9cd8696 100644
--- 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