From e1445da74730473a66a3ae8414e940aebfe6585d Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Mon, 17 Mar 2014 14:00:29 -0700 Subject: camera2: Don't log vendor tag errors when camera HAL too old Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c --- camera/ICameraService.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'camera/ICameraService.cpp') diff --git a/camera/ICameraService.cpp b/camera/ICameraService.cpp index ef6c0f4..b86651f 100644 --- a/camera/ICameraService.cpp +++ b/camera/ICameraService.cpp @@ -303,10 +303,10 @@ status_t BnCameraService::onTransact( reply->writeInt32(result); // out-variables are after exception and return value - reply->writeInt32(1); // means the parcelable is included if (d == NULL) { reply->writeInt32(0); } else { + reply->writeInt32(1); // means the parcelable is included d->writeToParcel(reply); } return NO_ERROR; @@ -320,7 +320,7 @@ status_t BnCameraService::onTransact( int32_t clientUid = data.readInt32(); sp camera; status_t status = connect(cameraClient, cameraId, - clientName, clientUid, /*out*/ camera); + clientName, clientUid, /*out*/camera); reply->writeNoException(); reply->writeInt32(status); if (camera != NULL) { @@ -340,7 +340,7 @@ status_t BnCameraService::onTransact( int32_t clientUid = data.readInt32(); sp camera; status_t status = connectPro(cameraClient, cameraId, - clientName, clientUid, /*out*/ camera); + clientName, clientUid, /*out*/camera); reply->writeNoException(); reply->writeInt32(status); if (camera != NULL) { @@ -360,7 +360,7 @@ status_t BnCameraService::onTransact( int32_t clientUid = data.readInt32(); sp camera; status_t status = connectDevice(cameraClient, cameraId, - clientName, clientUid, /*out*/ camera); + clientName, clientUid, /*out*/camera); reply->writeNoException(); reply->writeInt32(status); if (camera != NULL) { -- cgit v1.1