commit 2daf28f449a2162fe9a8050056450ca79d4b39b9
author Garfield Tan <xutan@google.com> Tue Nov 23 12:30:45 2021 -0800
committer Garfield Tan <xutan@google.com> Tue Nov 23 13:25:48 2021 -0800
tree 4f273cda6561c527982fa96de6bf39291ffef765
parent 35185d54b4352ac30d587ee42b360d9c46136d10

Guard absent SplitScreen in PipTaskOrganizer

Current code assumes the presence of SplitScreen, so it crashes if
SplitScreen doesn't exist.

Bug: 207495281
Test: Transition in and out of PIP still works on phones.
Test: Transition from PIP to split screen on phones.
Change-Id: I6f2f05a1237c9e64f1df95b05347a1affa9b5a27

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
index 6cc5f09..90135f2a 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java
@@ -1282,6 +1282,9 @@
     }
 
     private boolean isPipTopLeft() {
+        if (!mSplitScreenOptional.isPresent()) {
+            return false;
+        }
         final Rect topLeft = new Rect();
         final Rect bottomRight = new Rect();
         mSplitScreenOptional.get().getStageBounds(topLeft, bottomRight);