summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-05-17 21:10:35 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-05-17 21:10:35 +0000
commit71e1890b755f126274e8225875050c7b785006e4 (patch)
treef345be860c0d16ad43ad67a8721ced87f33e0395
parentb55734b8854d864d0feeeb1a5b12fa92dd0a7aef (diff)
parent202515fbdb1281947323f45d3f1eb1ff3f501dda (diff)
downloadnative-android10-qpr3-release.tar.gz
Merge cherrypicks of [11520371, 11520372, 11521176, 11521177, 11520373, 11520374, 11521196, 11521216, 11520730, 11521236, 11520430, 11521256, 11521276, 11520277, 11520278] into qt-qpr3-releaseandroid-10.0.0_r41android-10.0.0_r40android10-qpr3-release
Change-Id: Ifa25b35fd5704f786d08d85590f93b017cfa7f82
-rw-r--r--services/surfaceflinger/Client.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/surfaceflinger/Client.cpp b/services/surfaceflinger/Client.cpp
index 6bfd302b5c..c526f7f18f 100644
--- a/services/surfaceflinger/Client.cpp
+++ b/services/surfaceflinger/Client.cpp
@@ -88,11 +88,6 @@ status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32
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;
}