diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-22 13:09:57 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2014-05-22 20:45:50 +0000 |
| commit | 47ed7dfdae7a41a7532978bd799fa9defd2b9980 (patch) | |
| tree | 480a20a060a588baa99af7849b31d78f672ba19a | |
| parent | 24adc0400381612a97e8b30d83484f4107819d5c (diff) | |
| download | frameworks_av-47ed7dfdae7a41a7532978bd799fa9defd2b9980.zip frameworks_av-47ed7dfdae7a41a7532978bd799fa9defd2b9980.tar.gz frameworks_av-47ed7dfdae7a41a7532978bd799fa9defd2b9980.tar.bz2 | |
cameraservice: Fix ICameraDeviceUser aidl order.
Bug: 15167467
Change-Id: I19eb3d2ff86c0b395b6358e018c677b6e2d45c75
| -rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index 89ea46d..ff4a0c2 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -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: |