From db2ad5d974f56a0e7693d7cd2059249565bb6254 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 7 Feb 2017 17:18:01 -0800
Subject: [PATCH] Fixing crash when fetching stack bounds.

Bug: 35115909
Bug: 35112703
Test: Manual
Change-Id: I708501f2d94682e5e945e2ade52c5c53c2fb8067
---
 .../src/com/android/systemui/pip/phone/PipMotionHelper.java   | 4 +++-
 .../SystemUI/src/com/android/systemui/pip/tv/PipManager.java  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
index 28ab3fb41e997..fb3ed446212bf 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
@@ -107,7 +107,9 @@ public class PipMotionHelper {
         cancelAnimations();
         try {
             StackInfo stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
-            mBounds.set(stackInfo.bounds);
+            if (stackInfo != null) {
+                mBounds.set(stackInfo.bounds);
+            }
         } catch (RemoteException e) {
             Log.w(TAG, "Failed to get pinned stack bounds");
         }
diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index cf7b05efa21d7..e3db16a069c57 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -151,7 +151,7 @@ public class PipManager {
     private List<MediaListener> mMediaListeners = new ArrayList<>();
     private Rect mCurrentPipBounds;
     private Rect mPipBounds;
-    private Rect mDefaultPipBounds;
+    private Rect mDefaultPipBounds = new Rect();
     private Rect mSettingsPipBounds;
     private Rect mMenuModePipBounds;
     private Rect mRecentsPipBounds;