From 98e24724fb77445d4d015a5fec4ecbd5b49abc9b Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Wed, 19 Jun 2013 19:51:04 -0700 Subject: Make android.hardware.photography.Camera work on HAL3+ devices Bug: 9213377 Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5 --- services/camera/libcameraservice/CameraService.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'services/camera/libcameraservice/CameraService.h') 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 &who); // Helpers - int getDeviceVersion(int cameraId, int* facing); bool isValidCameraId(int cameraId); }; -- cgit v1.1