diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-08-27 16:49:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-27 16:49:13 +0000 |
| commit | e07f53720bcf543bcfe90c228a49c2a85a3fdb4c (patch) | |
| tree | 388f8ab6a1b539a7bd8b903479864f1c1a3afeb0 /camera | |
| parent | 8271f1a2225a34a0748624786392213a746c56d7 (diff) | |
| parent | abaa51d3ca31f0eda99e1d271e6dc64c877dbf58 (diff) | |
| download | frameworks_av-e07f53720bcf543bcfe90c228a49c2a85a3fdb4c.zip frameworks_av-e07f53720bcf543bcfe90c228a49c2a85a3fdb4c.tar.gz frameworks_av-e07f53720bcf543bcfe90c228a49c2a85a3fdb4c.tar.bz2 | |
Merge "Camera2: Add flush support" into klp-dev
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index 73fec72..1e5822f 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -41,6 +41,7 @@ enum { CREATE_DEFAULT_REQUEST, GET_CAMERA_INFO, WAIT_UNTIL_IDLE, + FLUSH }; namespace { @@ -196,6 +197,16 @@ public: return reply.readInt32(); } + virtual status_t flush() + { + ALOGV("flush"); + Parcel data, reply; + data.writeInterfaceToken(ICameraDeviceUser::getInterfaceDescriptor()); + remote()->transact(FLUSH, data, &reply); + reply.readExceptionCode(); + return reply.readInt32(); + } + private: @@ -325,6 +336,12 @@ status_t BnCameraDeviceUser::onTransact( reply->writeInt32(waitUntilIdle()); return NO_ERROR; } break; + case FLUSH: { + CHECK_INTERFACE(ICameraDeviceUser, data, reply); + reply->writeNoException(); + reply->writeInt32(flush()); + return NO_ERROR; + } default: return BBinder::onTransact(code, data, reply, flags); } |