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.cpp | |
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.cpp')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 55f7a40..58512eb 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -52,7 +52,6 @@ #include "CameraService.h" #include "api1/CameraClient.h" #include "api1/Camera2Client.h" -#include "api_pro/ProCamera2Client.h" #include "api2/CameraDeviceClient.h" #include "utils/CameraTraces.h" #include "CameraDeviceFactory.h" @@ -1066,16 +1065,6 @@ status_t CameraService::connectLegacy( return NO_ERROR; } -status_t CameraService::connectPro(const sp<IProCameraCallbacks>& cameraCb, - int cameraId, - const String16& clientPackageName, - int clientUid, - /*out*/ - sp<IProCameraUser>& device) { - ALOGE("%s: Unimplemented, please use connectDevice", __FUNCTION__); - return INVALID_OPERATION; -} - status_t CameraService::connectDevice( const sp<ICameraDeviceCallbacks>& cameraCb, int cameraId, @@ -1428,7 +1417,6 @@ status_t CameraService::onTransact( // Permission checks switch (code) { case BnCameraService::CONNECT: - case BnCameraService::CONNECT_PRO: case BnCameraService::CONNECT_DEVICE: case BnCameraService::CONNECT_LEGACY: const int pid = getCallingPid(); @@ -1710,33 +1698,6 @@ void CameraService::Client::OpsCallback::opChanged(int32_t op, } // ---------------------------------------------------------------------------- -// IProCamera -// ---------------------------------------------------------------------------- - -CameraService::ProClient::ProClient(const sp<CameraService>& cameraService, - const sp<IProCameraCallbacks>& remoteCallback, - const String16& clientPackageName, - int cameraId, - int cameraFacing, - int clientPid, - uid_t clientUid, - int servicePid) - : CameraService::BasicClient(cameraService, IInterface::asBinder(remoteCallback), - clientPackageName, cameraId, cameraFacing, - clientPid, clientUid, servicePid) -{ - mRemoteCallback = remoteCallback; -} - -CameraService::ProClient::~ProClient() { -} - -void CameraService::ProClient::notifyError(ICameraDeviceCallbacks::CameraErrorCode errorCode, - const CaptureResultExtras& resultExtras) { - mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0); -} - -// ---------------------------------------------------------------------------- // CameraState // ---------------------------------------------------------------------------- |