diff options
| author | Igor Murashkin <iam@google.com> | 2013-02-26 14:32:34 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-02-26 18:54:03 -0800 |
| commit | c073ba525404f3416c2824c435d3d926a9892f1b (patch) | |
| tree | f9fa36f1473054c5098bffa3926be9d2cbf6bd6f /services/camera/libcameraservice/CameraService.h | |
| parent | b39f30b0a4902ea0f28454885785da4b2629fe25 (diff) | |
| download | frameworks_av-c073ba525404f3416c2824c435d3d926a9892f1b.zip frameworks_av-c073ba525404f3416c2824c435d3d926a9892f1b.tar.gz frameworks_av-c073ba525404f3416c2824c435d3d926a9892f1b.tar.bz2 | |
camera_client: refactor Camera/ProCamera commonalities into BasicCamera
Change-Id: Ie10a4094522d49683657665fe94ab0b7ccd280e9
Diffstat (limited to 'services/camera/libcameraservice/CameraService.h')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index b017505..d93aa73 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -25,6 +25,11 @@ #include <camera/ICameraService.h> #include <hardware/camera.h> +#include <camera/ICamera.h> +#include <camera/ICameraClient.h> +#include <camera/IProCameraUser.h> +#include <camera/IProCameraCallbacks.h> + /* This needs to be increased if we can have more cameras */ #define MAX_CAMERAS 2 @@ -60,7 +65,7 @@ public: virtual sp<ICamera> connect(const sp<ICameraClient>& cameraClient, int cameraId, const String16& clientPackageName, int clientUid); virtual sp<IProCameraUser> connect(const sp<IProCameraCallbacks>& cameraCb, - int cameraId); + int cameraId, const String16& clientPackageName, int clientUid); // Extra permissions checks virtual status_t onTransact(uint32_t code, const Parcel& data, |