diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2015-03-18 23:11:57 -0700 |
|---|---|---|
| committer | Ruben Brunk <rubenbrunk@google.com> | 2015-03-20 22:34:54 -0700 |
| commit | 9efdf956cc2eef63fef609375901d6c8df6351b6 (patch) | |
| tree | 4e7cfe7a780397d9578bd7860023168ea62519a5 /services/camera/libcameraservice/common | |
| parent | 514d7af22c5d6526309e71fadcff42b072c30241 (diff) | |
| download | frameworks_av-9efdf956cc2eef63fef609375901d6c8df6351b6.zip frameworks_av-9efdf956cc2eef63fef609375901d6c8df6351b6.tar.gz frameworks_av-9efdf956cc2eef63fef609375901d6c8df6351b6.tar.bz2 | |
camera2: Remove ProCamera.
Bug: 19186859
Change-Id: I4aaadb53db65b479f92cbb3c05329d1e40317900
Diffstat (limited to 'services/camera/libcameraservice/common')
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.cpp | 1 | ||||
| -rw-r--r-- | services/camera/libcameraservice/common/Camera2ClientBase.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp index 0415d67..c0c2314 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp +++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp @@ -337,7 +337,6 @@ void Camera2ClientBase<TClientBase>::SharedCameraCallbacks::clear() { mRemoteCallback.clear(); } -template class Camera2ClientBase<CameraService::ProClient>; template class Camera2ClientBase<CameraService::Client>; template class Camera2ClientBase<CameraDeviceClientBase>; diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.h b/services/camera/libcameraservice/common/Camera2ClientBase.h index eb21d55..168ea0a 100644 --- a/services/camera/libcameraservice/common/Camera2ClientBase.h +++ b/services/camera/libcameraservice/common/Camera2ClientBase.h @@ -36,7 +36,7 @@ public: typedef typename TClientBase::TCamCallbacks TCamCallbacks; /** - * Base binder interface (see ICamera/IProCameraUser for details) + * Base binder interface (see ICamera/ICameraDeviceUser for details) */ virtual status_t connect(const sp<TCamCallbacks>& callbacks); virtual void disconnect(); |