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/CameraService.h | |
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/CameraService.h')
-rw-r--r-- | services/camera/libcameraservice/CameraService.h | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 53420e5..53f1c72 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -27,8 +27,6 @@ #include <camera/ICamera.h> #include <camera/ICameraClient.h> -#include <camera/IProCameraUser.h> -#include <camera/IProCameraCallbacks.h> #include <camera/camera2/ICameraDeviceUser.h> #include <camera/camera2/ICameraDeviceCallbacks.h> #include <camera/VendorTagDescriptor.h> @@ -127,11 +125,6 @@ public: /*out*/ sp<ICamera>& device); - virtual status_t connectPro(const sp<IProCameraCallbacks>& cameraCb, - int cameraId, const String16& clientPackageName, int clientUid, - /*out*/ - sp<IProCameraUser>& device); - virtual status_t connectDevice( const sp<ICameraDeviceCallbacks>& cameraCb, int cameraId, @@ -195,7 +188,7 @@ public: // virtual inheritance virtual sp<IBinder> asBinderWrapper() = 0; - // Return the remote callback binder object (e.g. IProCameraCallbacks) + // Return the remote callback binder object (e.g. ICameraDeviceCallbacks) sp<IBinder> getRemote() { return mRemoteBinder; } @@ -330,51 +323,6 @@ public: }; // class Client - class ProClient : public BnProCameraUser, public BasicClient { - public: - typedef IProCameraCallbacks TCamCallbacks; - - ProClient(const sp<CameraService>& cameraService, - const sp<IProCameraCallbacks>& remoteCallback, - const String16& clientPackageName, - int cameraId, - int cameraFacing, - int clientPid, - uid_t clientUid, - int servicePid); - - virtual ~ProClient(); - - const sp<IProCameraCallbacks>& getRemoteCallback() { - return mRemoteCallback; - } - - /*** - IProCamera implementation - ***/ - virtual status_t connect(const sp<IProCameraCallbacks>& callbacks) - = 0; - virtual status_t exclusiveTryLock() = 0; - virtual status_t exclusiveLock() = 0; - virtual status_t exclusiveUnlock() = 0; - - virtual bool hasExclusiveLock() = 0; - - // Note that the callee gets a copy of the metadata. - virtual int submitRequest(camera_metadata_t* metadata, - bool streaming = false) = 0; - virtual status_t cancelRequest(int requestId) = 0; - - // Callbacks from camera service - virtual void onExclusiveLockStolen() = 0; - - virtual void notifyError(ICameraDeviceCallbacks::CameraErrorCode errorCode, - const CaptureResultExtras& resultExtras); - protected: - - sp<IProCameraCallbacks> mRemoteCallback; - }; // class ProClient - typedef std::shared_ptr<resource_policy::ClientDescriptor<String8, sp<CameraService::BasicClient>>> DescriptorPtr; |