commit 202515fbdb1281947323f45d3f1eb1ff3f501dda
author Vishnu Nair <vishnun@google.com> Tue Apr 28 10:57:38 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Sun May 17 21:10:09 2020 +0000
tree f345be860c0d16ad43ad67a8721ced87f33e0395
parent b55734b8854d864d0feeeb1a5b12fa92dd0a7aef

Remove unsafe cast in Client::createWithSurfaceParent

Logs were initially added to debug an issue which has since been fixed.

Bug: b/150226994, b/134888387
Test: POC from file does not crash on device with AddressSanitizer
Change-Id: I582b1737026bd1dae62539a88e86dd2fd8edb539
(cherry picked from commit a03e1302db3c51be1e453af179e5549468b501ab)

services/surfaceflinger/Client.cpp

diff --git a/services/surfaceflinger/Client.cpp b/services/surfaceflinger/Client.cpp
index 6bfd302..c526f7f 100644
--- a/services/surfaceflinger/Client.cpp
+++ b/services/surfaceflinger/Client.cpp
@@ -88,11 +88,6 @@
                                          sp<IGraphicBufferProducer>* gbp) {
     if (mFlinger->authenticateSurfaceTexture(parent) == false) {
         ALOGE("failed to authenticate surface texture");
-        // The extra parent layer check below before returning is to help with debugging
-        // b/134888387. Once the bug is fixed the check can be deleted.
-        if ((static_cast<MonitoredProducer*>(parent.get()))->getLayer() == nullptr) {
-            ALOGE("failed to find parent layer");
-        }
         return BAD_VALUE;
     }