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();
         }
     }