From 907fd630a648d36fbfeeb4dd69847439012aa630 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 2 Apr 2020 17:13:08 -0700
Subject: [PATCH] Ignore the negative minWidth/minHeight populated from
 windowLayout

When an activity specifies defaultWidth/defaultHeight in <layout>
without minWidth/minHeight, -1 will be populated into windowLayout for
those fields.

Bug: 152933995
Test: manual enter/exit PiP from Duo app
Change-Id: I9056891f2baafbad9268a45a6820ec515d6f1b84
---
 .../src/com/android/systemui/pip/PipTaskOrganizer.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index 15c9dbad16802..8cff20ac31f7d 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -37,7 +37,6 @@ import android.graphics.Rect;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.RemoteException;
 import android.util.Log;
 import android.util.Size;
 import android.view.SurfaceControl;
@@ -541,7 +540,12 @@ public class PipTaskOrganizer extends TaskOrganizer {
             return null;
         }
         final ActivityInfo.WindowLayout windowLayout = activityInfo.windowLayout;
-        return new Size(windowLayout.minWidth, windowLayout.minHeight);
+        // -1 will be populated if an activity specifies defaultWidth/defaultHeight in <layout>
+        // without minWidth/minHeight
+        if (windowLayout.minWidth > 0 && windowLayout.minHeight > 0) {
+            return new Size(windowLayout.minWidth, windowLayout.minHeight);
+        }
+        return null;
     }
 
     private float getAspectRatioOrDefault(@Nullable PictureInPictureParams params) {