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

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

Merge "camera2: Fix native binder interface and add tests." into mnc-dev

parents 63770946 3450ba78

camera/ICameraService.cpp

+3 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ public: 
        }



        Parcel data, reply;

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



        data.writeInt32(cameraId);

        remote()->transact(BnCameraService::GET_LEGACY_PARAMETERS, data, &reply);
@@ -304,6 +305,7 @@ public: 
    virtual status_t supportsCameraApi(int cameraId, int apiVersion) {

        Parcel data, reply;



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

        data.writeInt32(cameraId);

        data.writeInt32(apiVersion);

        remote()->transact(BnCameraService::SUPPORTS_CAMERA_API, data, &reply);
@@ -315,6 +317,7 @@ public: 


    virtual void notifySystemEvent(int32_t eventId, const int32_t* args, size_t len) {

        Parcel data, reply;

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

        data.writeInt32(eventId);

        data.writeInt32Array(len, args);

        remote()->transact(BnCameraService::NOTIFY_SYSTEM_EVENT, data, &reply,

camera/ICameraServiceListener.cpp

+5 −9
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ public: 
    virtual void onStatusChanged(Status status, int32_t cameraId)

    {

        Parcel data, reply;

        data.writeInterfaceToken(

                              ICameraServiceListener::getInterfaceDescriptor());

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



        data.writeInt32(static_cast<int32_t>(status));

        data.writeInt32(cameraId);
@@ -60,8 +59,7 @@ public: 
    virtual void onTorchStatusChanged(TorchStatus status, const String16 &cameraId)

    {

        Parcel data, reply;

        data.writeInterfaceToken(

                              ICameraServiceListener::getInterfaceDescriptor());

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



        data.writeInt32(static_cast<int32_t>(status));

        data.writeString16(cameraId);
@@ -73,14 +71,12 @@ public: 
    }

};



IMPLEMENT_META_INTERFACE(CameraServiceListener,

                         "android.hardware.ICameraServiceListener");

IMPLEMENT_META_INTERFACE(CameraServiceListener, "android.hardware.ICameraServiceListener");



// ----------------------------------------------------------------------



status_t BnCameraServiceListener::onTransact(

    uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)

{

status_t BnCameraServiceListener::onTransact(uint32_t code, const Parcel& data, Parcel* reply,

        uint32_t flags) {

    switch(code) {

        case STATUS_CHANGED: {

            CHECK_INTERFACE(ICameraServiceListener, data, reply);

camera/camera2/ICameraDeviceUser.cpp

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public: 
        reply.readExceptionCode();

    }



    virtual status_t submitRequest(sp<CaptureRequest> request, bool repeating,

    virtual int submitRequest(sp<CaptureRequest> request, bool repeating,

                              int64_t *lastFrameNumber)

    {

        Parcel data, reply;
@@ -111,13 +111,13 @@ public: 
            }

        }



	if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) {

        if (res < 0 || (resFrameNumber != NO_ERROR)) {

            res = FAILED_TRANSACTION;

        }

        return res;

    }



    virtual status_t submitRequestList(List<sp<CaptureRequest> > requestList, bool repeating,

    virtual int submitRequestList(List<sp<CaptureRequest> > requestList, bool repeating,

                                  int64_t *lastFrameNumber)

    {

        Parcel data, reply;
@@ -151,7 +151,7 @@ public: 
                resFrameNumber = reply.readInt64(lastFrameNumber);

            }

        }

        if ((res < NO_ERROR) || (resFrameNumber != NO_ERROR)) {

        if (res < 0 || (resFrameNumber != NO_ERROR)) {

            res = FAILED_TRANSACTION;

        }

        return res;

camera/camera2/OutputConfiguration.cpp

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ OutputConfiguration::OutputConfiguration(const Parcel& parcel) { 
          gbp.get(), String8(name).string());

}



OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation) {

    mGbp = gbp;

    mRotation = rotation;

}



status_t OutputConfiguration::writeToParcel(Parcel& parcel) const {



    parcel.writeInt32(mRotation);

camera/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ include $(CLEAR_VARS) 
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



LOCAL_SRC_FILES:= \

	VendorTagDescriptorTests.cpp

	VendorTagDescriptorTests.cpp \

	CameraBinderTests.cpp



LOCAL_SHARED_LIBRARIES := \

	libutils \