summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2019-04-03 11:32:41 -0700
committer Winson Chung <winsonc@google.com> 2019-04-03 12:15:45 -0700
commit54844b4ca031bd7aab67a01ba7ba05e1cb96f344 (patch)
tree2518a92f761aed0ce86824adbe4bd9e3318c45d9
parent0b03b6c84bc1630fa1471775b977e7f4c443c620 (diff)
Add null check before setting min size
Bug: 126272951 Test: Not reproducible Change-Id: Iaad5b04df48ddf865101ba96bc560c0028f5f3d1
-rw-r--r--packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
index 3140e6db2442..3ec6cb78ecc1 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipTouchHandler.java
@@ -795,7 +795,10 @@ public class PipTouchHandler {
? mExpandedMovementBounds
: mNormalMovementBounds;
try {
- mPinnedStackController.setMinEdgeSize(isMenuExpanded ? mExpandedShortestEdgeSize : 0);
+ if (mPinnedStackController != null) {
+ mPinnedStackController.setMinEdgeSize(
+ isMenuExpanded ? mExpandedShortestEdgeSize : 0);
+ }
} catch (RemoteException e) {
Log.e(TAG, "Could not set minimized state", e);
}