From 7b2fdb4cea0e40cec4010674253d31426f6feb66 Mon Sep 17 00:00:00 2001
From: Diego Vela <diegovela@google.com>
Date: Mon, 13 Jul 2020 15:20:59 -0700
Subject: [PATCH] Fix mismatchecd use of isEmpty in Sidecar

Replace use of isEmpty with check for zero Rect.

Test: n/a
Bug: 160827187
Change-Id: I22c041e095fd9b28c3b526f78e2adecd2ea4b88e
---
 .../src/androidx/window/sidecar/SettingsSidecarImpl.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
index 92e575804bbe3..ca3a5112bc55f 100644
--- a/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
+++ b/libs/WindowManager/Jetpack/src/androidx/window/sidecar/SettingsSidecarImpl.java
@@ -192,7 +192,7 @@ class SettingsSidecarImpl extends StubSidecar {
                 Rect featureRect = new Rect(left, top, right, bottom);
                 rotateRectToDisplayRotation(featureRect, displayId);
                 transformToWindowSpaceRect(featureRect, windowToken);
-                if (!featureRect.isEmpty()) {
+                if (isNotZero(featureRect)) {
                     SidecarDisplayFeature feature = new SidecarDisplayFeature();
                     feature.setRect(featureRect);
                     feature.setType(type);
@@ -207,6 +207,10 @@ class SettingsSidecarImpl extends StubSidecar {
         return features;
     }
 
+    private static boolean isNotZero(Rect rect) {
+        return rect.height() > 0 || rect.width() > 0;
+    }
+
     @Override
     protected void onListenersChanged() {
         if (mSettingsObserver == null) {