| commit | a82001555eb1f5c862f26dc99b9cfa4c12f87f82 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Tue Jul 07 07:26:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 07 07:26:18 2020 +0000 |
| tree | 9863ed38b5c11446f0a476a4b75f0dc451fd1296 | |
| parent | 017f3a1ca63abc4fe4356131fa4e266be79d7912 [diff] | |
| parent | 73a7dc4fed1d00d88982fb08b088b2a76d8962a6 [diff] |
Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 73a7dc4fed Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1355921 Change-Id: I363a1f502831f7fdd95c4075e8ee47b4bfc2f555
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; }