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 /include/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 'include/camera')
| -rw-r--r-- | include/camera/ICameraRecordingProxy.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/camera/ICameraRecordingProxy.h b/include/camera/ICameraRecordingProxy.h index 2aac284..4edf9cd 100644 --- a/include/camera/ICameraRecordingProxy.h +++ b/include/camera/ICameraRecordingProxy.h @@ -83,6 +83,12 @@ public: virtual status_t startRecording(const sp<ICameraRecordingProxyListener>& listener) = 0; virtual void stopRecording() = 0; virtual void releaseRecordingFrame(const sp<IMemory>& mem) = 0; + + // b/28466701 + static size_t getCommonBaseAddress(); + private: + + static uint8_t baseObject; }; // ---------------------------------------------------------------------------- |