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

Commit 73a7dc4f authored by Bill Yi's avatar Bill Yi
Browse files

Merge android10-qpr3-release to aosp-master - DO NOT MERGE 

Change-Id: I9c79f2cc954260b623ffaeba26e0fc3d84d975fc
parents 066ff587 71e1890b

services/surfaceflinger/Client.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -88,11 +88,6 @@ status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32 
                                         sp<IGraphicBufferProducer>* gbp) {

                                         sp<IGraphicBufferProducer>* gbp) {

    if (mFlinger->authenticateSurfaceTexture(parent) == false) {

    if (mFlinger->authenticateSurfaceTexture(parent) == false) {

        ALOGE("failed to authenticate surface texture");

        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;

        return BAD_VALUE;

    }

    }