commit 0741ea648438c1b9fa9b300a052a7ac54dbbfbc7
author Winson Chung <winsonc@google.com> Wed Jan 25 11:00:21 2017 -0800
committer gitbuildkicker <android-build@google.com> Wed Jan 25 13:15:40 2017 -0800
tree 3c12ac0c52cd8c1b3ff7e573ec41895c030b44e9
parent 4d472380348f7b642e8c6c3468ccfaacc3e00969

Skip resizing the stack when there is no current bounds.

- When initially calling loadConfigurationsAndApply(), the state is
  set to STATE_NO_PIP when there is no pinned stack.  As of change
  ag/1725150, resizeStack no longer fails silently when there is no
  such stack to resize.  This CL skips the call to resizeStack() when
  the PiP mode is set to STATE_NO_PIP.

Bug: 34692144
Test: Try and launch Fugu
Change-Id: Ic539f4431c2f94e7c10520c383fa49157d1d0631
(cherry picked from commit 87794464669d1dba94c7277f1fa1f21d6e3be82d)

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

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 56947e5..964fefa 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -377,16 +377,18 @@
                 mCurrentPipBounds = mPipBounds;
                 break;
         }
-        try {
-            int animationDurationMs = -1;
-            if (wasRecentsShown
-                    && (mState == STATE_PIP_RECENTS || mState == STATE_PIP_RECENTS_FOCUSED)) {
-                animationDurationMs = mRecentsFocusChangedAnimationDurationMs;
+        if (mCurrentPipBounds != null) {
+            try {
+                int animationDurationMs = -1;
+                if (wasRecentsShown
+                        && (mState == STATE_PIP_RECENTS || mState == STATE_PIP_RECENTS_FOCUSED)) {
+                    animationDurationMs = mRecentsFocusChangedAnimationDurationMs;
+                }
+                mActivityManager.resizeStack(PINNED_STACK_ID, mCurrentPipBounds,
+                        true, true, true, animationDurationMs);
+            } catch (RemoteException e) {
+                Log.e(TAG, "resizeStack failed", e);
             }
-            mActivityManager.resizeStack(PINNED_STACK_ID, mCurrentPipBounds,
-                    true, true, true, animationDurationMs);
-        } catch (RemoteException e) {
-            Log.e(TAG, "resizeStack failed", e);
         }
     }