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

Commit 6d69f91a authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Merge "Enable protected contents in GPU composition by default."

parents 4c53e1d5 548d4fae

services/surfaceflinger/SurfaceFlinger.cpp

+1 −7
Original line number Diff line number Diff line
@@ -3248,8 +3248,7 @@ bool SurfaceFlinger::doComposeSurfaces(const sp<DisplayDevice>& displayDevice, 
    const auto& displayState = display->getState();

    const auto displayId = display->getId();

    auto& renderEngine = getRenderEngine();

    const bool supportProtectedContent =

            mDebugEnableProtectedContent && renderEngine.supportsProtectedContent();

    const bool supportProtectedContent = renderEngine.supportsProtectedContent();



    const Region bounds(displayState.bounds);

    const DisplayRenderArea renderArea(displayDevice);
@@ -5326,11 +5325,6 @@ status_t SurfaceFlinger::onTransact(uint32_t code, const Parcel& data, Parcel* r 
                }

                return NO_ERROR;

            }

            case 1032: {

                n = data.readInt32();

                mDebugEnableProtectedContent = n;

                return NO_ERROR;

            }

            // Set trace flags

            case 1033: {

                n = data.readUint32();

services/surfaceflinger/SurfaceFlinger.h

+0 −1
Original line number Diff line number Diff line
@@ -995,7 +995,6 @@ private: 
    int mDebugRegion = 0;

    bool mDebugDisableHWC = false;

    bool mDebugDisableTransformHint = false;

    bool mDebugEnableProtectedContent = false;

    volatile nsecs_t mDebugInTransaction = 0;

    bool mForceFullDamage = false;

    bool mPropagateBackpressure = true;