Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8200155 authored by Bill Yi's avatar Bill Yi Committed by Automerger Merge Worker
Browse files

Merge android10-qpr3-release to aosp-master - DO NOT MERGE am: 73a7dc4f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1355921

Change-Id: I363a1f502831f7fdd95c4075e8ee47b4bfc2f555
parents 017f3a1c 73a7dc4f

services/surfaceflinger/Client.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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;

    }