From 687bcb7f3390cfba1ca0362367d5c9010dffc507 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Tue, 10 Sep 2019 10:52:32 -0700
Subject: [PATCH] Skip updating exclusion rects unless one is set

Bug: 140775753
Bug: 140701977
Bug: 140758369
Test: atest google/perf/jank/SystemUI/UbSystemUIJankTests:android.platform.systemui.tests.jank.SystemUiJankTests#testQuickSettingsPull -v
Change-Id: I824ca918d141eb88aa99b1e90adafe64ca3eb672
---
 core/java/android/view/View.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 84665f78c7029..c6536bb71cba1 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -14431,8 +14431,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         }
 
         notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);
-        if (isVisible != oldVisible) {
-            updateSystemGestureExclusionRects();
+        if (!getSystemGestureExclusionRects().isEmpty() && isVisible != oldVisible) {
+            postUpdateSystemGestureExclusionRects();
         }
     }