diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-22 20:36:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-22 20:36:46 +0000 |
| commit | ce8ae0f62a01cb3a390812db47bb08f29a8aee0d (patch) | |
| tree | 2d61fe9b1739c6b269d3863586f75d38893357de /camera | |
| parent | 87cebadd48710e42474756fc3513df678de045ce (diff) | |
| parent | 29478402ba0683323b7c7ff4843c8c2a4f0673d5 (diff) | |
| download | frameworks_av-ce8ae0f62a01cb3a390812db47bb08f29a8aee0d.zip frameworks_av-ce8ae0f62a01cb3a390812db47bb08f29a8aee0d.tar.gz frameworks_av-ce8ae0f62a01cb3a390812db47bb08f29a8aee0d.tar.bz2 | |
Merge "cameraservice: Fix ICameraDeviceUser aidl order."
Diffstat (limited to 'camera')
| -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: |