From 021d871e57e0ff380cb8fcc5907755aa28b3ce41 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Mon, 25 Mar 2019 18:04:08 +0100
Subject: [PATCH] Gesture Exclusion: Fix crash when exclusion updates after
 detaching window

Fixes: 129268298
Test: atest android.view.cts.SystemGestureExclusionRectsTest
Change-Id: I9dd72f7905ca859974e3b36150cd6fe38f771918
---
 core/java/android/view/ViewRootImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2880e7f135456..b77a854cd228f 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3986,7 +3986,7 @@ public final class ViewRootImpl implements ViewParent,
 
     void systemGestureExclusionChanged() {
         final List<Rect> rectsForWindowManager = mGestureExclusionTracker.computeChangedRects();
-        if (rectsForWindowManager != null) {
+        if (rectsForWindowManager != null && mView != null) {
             try {
                 mWindowSession.reportSystemGestureExclusionChanged(mWindow, rectsForWindowManager);
             } catch (RemoteException e) {