diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-07-25 17:12:35 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-07-30 10:58:44 -0700 |
| commit | 7b82efe7a376c882f8f938e1c41b8311a8cdda4a (patch) | |
| tree | d7ed69f0a495bc1a873a285ba11e72a9867c5565 /camera/ICameraService.cpp | |
| parent | d054c32443a493513ab63529b0c8b1aca290278c (diff) | |
| download | frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.zip frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.gz frameworks_av-7b82efe7a376c882f8f938e1c41b8311a8cdda4a.tar.bz2 | |
Camera: Rename new API to camera2, rearrange camera service
- Support API rename from photography to camera2
- Reorganize camera service files
- API support files to api1/, api2/, api_pro/
- HAL device support files into device{1,2,3}/
- Common files into common/
- Camera service remains at top-level
Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
Diffstat (limited to 'camera/ICameraService.cpp')
| -rw-r--r-- | camera/ICameraService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/ICameraService.cpp b/camera/ICameraService.cpp index 068fb0f..876a2df 100644 --- a/camera/ICameraService.cpp +++ b/camera/ICameraService.cpp @@ -31,8 +31,8 @@ #include <camera/IProCameraCallbacks.h> #include <camera/ICamera.h> #include <camera/ICameraClient.h> -#include <camera/photography/ICameraDeviceUser.h> -#include <camera/photography/ICameraDeviceCallbacks.h> +#include <camera/camera2/ICameraDeviceUser.h> +#include <camera/camera2/ICameraDeviceCallbacks.h> namespace android { @@ -151,7 +151,7 @@ public: return interface_cast<IProCameraUser>(reply.readStrongBinder()); } - // connect to camera service (android.hardware.photography.CameraDevice) + // connect to camera service (android.hardware.camera2.CameraDevice) virtual sp<ICameraDeviceUser> connect( const sp<ICameraDeviceCallbacks>& cameraCb, int cameraId, |