diff options
| author | Igor Murashkin <iam@google.com> | 2013-06-19 19:51:04 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-06-20 20:31:36 -0700 |
| commit | 98e24724fb77445d4d015a5fec4ecbd5b49abc9b (patch) | |
| tree | 0cb728e66991da37489bac60fd1ac9870c4d095d /services/camera/libcameraservice/CameraService.h | |
| parent | e7ee7637747371635a85fedd24d2190bb1f38651 (diff) | |
| download | frameworks_av-98e24724fb77445d4d015a5fec4ecbd5b49abc9b.zip frameworks_av-98e24724fb77445d4d015a5fec4ecbd5b49abc9b.tar.gz frameworks_av-98e24724fb77445d4d015a5fec4ecbd5b49abc9b.tar.bz2 | |
Make android.hardware.photography.Camera work on HAL3+ devices
Bug: 9213377
Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index cab804e..2bf7b49 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -106,6 +106,10 @@ public: void playSound(sound_kind kind); void releaseSound(); + ///////////////////////////////////////////////////////////////////// + // CameraDeviceFactory functionality + int getDeviceVersion(int cameraId, int* facing = NULL); + ///////////////////////////////////////////////////////////////////// // CameraClient functionality @@ -372,7 +376,6 @@ private: virtual void binderDied(const wp<IBinder> &who); // Helpers - int getDeviceVersion(int cameraId, int* facing); bool isValidCameraId(int cameraId); }; |