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

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

Merge "Fix getProtectedContentSupport API."

parents eb06dee1 b6888fab

libs/gui/ISurfaceComposer.cpp

+6 −7
Original line number Diff line number Diff line
@@ -687,13 +687,13 @@ public: 
    virtual status_t getProtectedContentSupport(bool* outSupported) const {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        status_t error =

                remote()->transact(BnSurfaceComposer::GET_PROTECTED_CONTENT_SUPPORT, data, &reply);

        bool result;

        status_t err = reply.readBool(&result);

        if (err == NO_ERROR) {

            *outSupported = result;

        if (error != NO_ERROR) {

            return error;

        }

        return err;

        error = reply.readBool(outSupported);

        return error;

    }



    virtual status_t cacheBuffer(const sp<IBinder>& token, const sp<GraphicBuffer>& buffer,
@@ -1187,7 +1187,6 @@ status_t BnSurfaceComposer::onTransact( 
            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            bool result;

            status_t error = getProtectedContentSupport(&result);

            reply->writeInt32(error);

            if (error == NO_ERROR) {

                reply->writeBool(result);

            }