commit 3d3e0ff0ee45fb25a0c13b2af3e78b6ad7181f21
author Marissa Wall <marissaw@google.com> Thu Jun 13 18:52:03 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 13 18:52:03 2019 -0700
tree 744dbd5d420d855d6d838d154742cbeaa3c15d11
parent 4d7cfb0fbb5abe1302a8d534a473d16c11144ff2
parent 9129069774d6d846dd1e30cff194283de8c7fef3

Merge "createWithSurfaceParent: add logging" into qt-dev
am: 9129069774

Change-Id: Ibaa2133d06b0e0b043703e37744ae7ef65800651

services/surfaceflinger/Client.cpp

diff --git a/services/surfaceflinger/Client.cpp b/services/surfaceflinger/Client.cpp
index 482c723..6bfd302 100644
--- a/services/surfaceflinger/Client.cpp
+++ b/services/surfaceflinger/Client.cpp
@@ -87,11 +87,18 @@
                                          LayerMetadata metadata, sp<IBinder>* handle,
                                          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;
     }
 
     const auto& layer = (static_cast<MonitoredProducer*>(parent.get()))->getLayer();
     if (layer == nullptr) {
+        ALOGE("failed to find parent layer");
         return BAD_VALUE;
     }