commit e95c62d74ab1423e59b5784e29fd6c494164e0cc
author John Reck <jreck@google.com> Tue Aug 18 12:37:43 2020 -0700
committer John Reck <jreck@google.com> Tue Aug 18 13:21:39 2020 -0700
tree dfb390281fe852b21474dc4f9087755049814c27
parent 408f136b477eda5a3a6e99295b66744633dd3c20

Fix crash regression when calling setSurface(null)

Test: HardwareRendererTests#testSetNullSurface
Fixes: 165335939
Change-Id: I8f93a0b6a115088af634e21e91b95b4f6a521f12

libs/hwui/renderthread/RenderProxy.cpp

diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index aad0cca..b51f6dc 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -77,10 +77,10 @@
 }
 
 void RenderProxy::setSurface(ANativeWindow* window, bool enableTimeout) {
-    ANativeWindow_acquire(window);
+    if (window) { ANativeWindow_acquire(window); }
     mRenderThread.queue().post([this, win = window, enableTimeout]() mutable {
         mContext->setSurface(win, enableTimeout);
-        ANativeWindow_release(win);
+        if (win) { ANativeWindow_release(win); }
     });
 }