diff options
| author | Igor Murashkin <iam@google.com> | 2013-03-01 16:22:28 -0800 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2013-03-11 16:32:24 -0700 |
| commit | 44cfcf00b9008c1c04f4c8277c6c06af039fd976 (patch) | |
| tree | a9abbcc639972250b3c5f0d7faaed3b66d1728b3 /services/camera/libcameraservice/CameraService.cpp | |
| parent | 840b2613863218fe6198dca817cc33ce76cdbfb7 (diff) | |
| download | frameworks_av-44cfcf00b9008c1c04f4c8277c6c06af039fd976.zip frameworks_av-44cfcf00b9008c1c04f4c8277c6c06af039fd976.tar.gz frameworks_av-44cfcf00b9008c1c04f4c8277c6c06af039fd976.tar.bz2 | |
CameraService: Refactor Camera2Client to share a base with ProCameraClient
Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
Diffstat (limited to 'services/camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 8c4f619..d46ca88 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -223,7 +223,9 @@ sp<ICamera> CameraService::connect( if (mClient[cameraId] != 0) { client = mClient[cameraId].promote(); if (client != 0) { - if (cameraClient->asBinder() == client->getCameraClient()->asBinder()) { + if (cameraClient->asBinder() == + client->getRemoteCallback()->asBinder()) { + LOG1("CameraService::connect X (pid %d) (the same client)", callingPid); return client; @@ -496,7 +498,7 @@ sp<CameraService::Client> CameraService::findClientUnsafe( continue; } - if (cameraClient == client->getCameraClient()->asBinder()) { + if (cameraClient == client->getRemoteCallback()->asBinder()) { // Found our camera outIndex = i; return client; @@ -639,7 +641,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService, int callingPid = getCallingPid(); LOG1("Client::Client E (pid %d, id %d)", callingPid, cameraId); - mCameraClient = cameraClient; + mRemoteCallback = cameraClient; cameraService->setCameraBusy(cameraId); cameraService->loadSound(); @@ -666,7 +668,7 @@ CameraService::BasicClient::BasicClient(const sp<CameraService>& cameraService, mClientPackageName(clientPackageName) { mCameraService = cameraService; - mRemoteCallback = remoteCallback; + mRemoteBinder = remoteCallback; mCameraId = cameraId; mCameraFacing = cameraFacing; mClientPid = clientPid; @@ -681,7 +683,7 @@ CameraService::BasicClient::~BasicClient() { } void CameraService::BasicClient::disconnect() { - mCameraService->removeClientByRemote(mRemoteCallback); + mCameraService->removeClientByRemote(mRemoteBinder); } status_t CameraService::BasicClient::startCameraOps() { @@ -767,7 +769,7 @@ CameraService::Client* CameraService::Client::getClientFromCookie(void* user) { } void CameraService::Client::notifyError() { - mCameraClient->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0); + mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0); } // NOTE: function is idempotent |