From e0366681374395b430ad883b3f7cdc0eb4314ec1 Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Wed, 10 Feb 2021 16:43:44 -0800
Subject: [PATCH] Check if SC is valid before calling setTransparentRegionHint

Fixes: 179863777
Test: Steps from bug
Change-Id: I915a3f8cdef3e21d33e9458c35db7259ed88ca5d
---
 core/java/android/view/ViewRootImpl.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4716141ee8d30..94e3dd13c08da 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -3070,8 +3070,10 @@ public final class ViewRootImpl implements ViewParent,
                     // via the WM relayout code path. We probably eventually
                     // want to synchronize transparent region hint changes
                     // with draws.
-                    mTransaction.setTransparentRegionHint(getSurfaceControl(),
-                        mTransparentRegion).apply();
+                    SurfaceControl sc = getSurfaceControl();
+                    if (sc.isValid()) {
+                        mTransaction.setTransparentRegionHint(sc, mTransparentRegion).apply();
+                    }
                 }
             }