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

Commit ce8ae0f6 authored by Ruben Brunk's avatar Ruben Brunk Committed by Android (Google) Code Review
Browse files

Merge "cameraservice: Fix ICameraDeviceUser aidl order."

parents 87cebadd 29478402

camera/camera2/ICameraDeviceUser.cpp

+23 −23
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ enum { 
    SUBMIT_REQUEST,

    SUBMIT_REQUEST_LIST,

    CANCEL_REQUEST,

    BEGIN_CONFIGURE,

    END_CONFIGURE,

    DELETE_STREAM,

    CREATE_STREAM,

    CREATE_DEFAULT_REQUEST,

    GET_CAMERA_INFO,

    WAIT_UNTIL_IDLE,

    FLUSH,

    BEGIN_CONFIGURE,

    END_CONFIGURE

    FLUSH

};



namespace {
@@ -176,6 +176,26 @@ public: 
        return res;

    }



    virtual status_t beginConfigure()

    {

        ALOGV("beginConfigure");

        Parcel data, reply;

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

        remote()->transact(BEGIN_CONFIGURE, data, &reply);

        reply.readExceptionCode();

        return reply.readInt32();

    }



    virtual status_t endConfigure()

    {

        ALOGV("endConfigure");

        Parcel data, reply;

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

        remote()->transact(END_CONFIGURE, data, &reply);

        reply.readExceptionCode();

        return reply.readInt32();

    }



    virtual status_t deleteStream(int streamId)

    {

        Parcel data, reply;
@@ -285,26 +305,6 @@ public: 
        return res;

    }



    virtual status_t beginConfigure()

    {

        ALOGV("beginConfigure");

        Parcel data, reply;

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

        remote()->transact(BEGIN_CONFIGURE, data, &reply);

        reply.readExceptionCode();

        return reply.readInt32();

    }



    virtual status_t endConfigure()

    {

        ALOGV("endConfigure");

        Parcel data, reply;

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

        remote()->transact(END_CONFIGURE, data, &reply);

        reply.readExceptionCode();

        return reply.readInt32();

    }



private: