commit e1445da74730473a66a3ae8414e940aebfe6585d
author Igor Murashkin <iam@google.com> Mon Mar 17 14:00:29 2014 -0700
committer Igor Murashkin <iam@google.com> Mon Mar 17 14:00:29 2014 -0700
tree 4156e14e4528fffe1ec29f48bffd78c2fcd0d786
parent 1c2b6e5e9671a5ea9eb26d24b772bb26bfa6d107

camera2: Don't log vendor tag errors when camera HAL too old

Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c

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 @@
             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 @@
             int32_t clientUid = data.readInt32();
             sp<ICamera> 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 @@
             int32_t clientUid = data.readInt32();
             sp<IProCameraUser> 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 @@
             int32_t clientUid = data.readInt32();
             sp<ICameraDeviceUser> camera;
             status_t status = connectDevice(cameraClient, cameraId,
-                    clientName, clientUid, /*out*/ camera);
+                    clientName, clientUid, /*out*/camera);
             reply->writeNoException();
             reply->writeInt32(status);
             if (camera != NULL) {

camera/VendorTagDescriptor.cpp

diff --git a/camera/VendorTagDescriptor.cpp b/camera/VendorTagDescriptor.cpp
index 89b0ea8..a0a6a51 100644
--- a/camera/VendorTagDescriptor.cpp
+++ b/camera/VendorTagDescriptor.cpp
@@ -236,7 +236,7 @@
     return res;
 }
 
-status_t VendorTagDescriptor::setAsGlobalVendorTagDescriptor(sp<VendorTagDescriptor>& desc) {
+status_t VendorTagDescriptor::setAsGlobalVendorTagDescriptor(const sp<VendorTagDescriptor>& desc) {
     status_t res = OK;
     Mutex::Autolock al(sLock);
     sGlobalVendorTagDescriptor = desc;