diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:02:17 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:41 -0700 |
| commit | aa98968601ddb19d92790bf76bddd351dbc4c640 (patch) | |
| tree | 465e1907f96ee6a67504dada03cff5c2a3326b01 /camera | |
| parent | a5ec3545f879e882ed5397707f65a4757f7232d5 (diff) | |
| parent | 1f24c730ab6ca5aff1e3137b340b8aeaeda4bdbc (diff) | |
| download | frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.zip frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.tar.gz frameworks_av-aa98968601ddb19d92790bf76bddd351dbc4c640.tar.bz2 | |
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: Ic86e42d5fb8f81fe5c4f58d2e76852829c609760
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/ICameraRecordingProxy.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camera/ICameraRecordingProxy.cpp b/camera/ICameraRecordingProxy.cpp index 3dc0ffb..517b64f 100644 --- a/camera/ICameraRecordingProxy.cpp +++ b/camera/ICameraRecordingProxy.cpp @@ -31,6 +31,11 @@ enum { RELEASE_RECORDING_FRAME, }; +uint8_t ICameraRecordingProxy::baseObject = 0; + +size_t ICameraRecordingProxy::getCommonBaseAddress() { + return (size_t)&baseObject; +} class BpCameraRecordingProxy: public BpInterface<ICameraRecordingProxy> { @@ -106,4 +111,3 @@ status_t BnCameraRecordingProxy::onTransact( // ---------------------------------------------------------------------------- }; // namespace android - |