camera2: Don't log vendor tag errors when camera HAL too old
Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
diff --git a/include/camera/ICameraService.h b/include/camera/ICameraService.h
index 6ccbf67..6e48f22 100644
--- a/include/camera/ICameraService.h
+++ b/include/camera/ICameraService.h
@@ -60,12 +60,16 @@
virtual int32_t getNumberOfCameras() = 0;
virtual status_t getCameraInfo(int cameraId,
- struct CameraInfo* cameraInfo) = 0;
+ /*out*/
+ struct CameraInfo* cameraInfo) = 0;
virtual status_t getCameraCharacteristics(int cameraId,
- CameraMetadata* cameraInfo) = 0;
+ /*out*/
+ CameraMetadata* cameraInfo) = 0;
- virtual status_t getCameraVendorTagDescriptor(sp<VendorTagDescriptor>& desc) = 0;
+ virtual status_t getCameraVendorTagDescriptor(
+ /*out*/
+ sp<VendorTagDescriptor>& desc) = 0;
// Returns 'OK' if operation succeeded
// - Errors: ALREADY_EXISTS if the listener was already added
diff --git a/include/camera/VendorTagDescriptor.h b/include/camera/VendorTagDescriptor.h
index 0fefe1a..ea21d31 100644
--- a/include/camera/VendorTagDescriptor.h
+++ b/include/camera/VendorTagDescriptor.h
@@ -63,7 +63,9 @@
*
* Returns OK on success, or a negative error code.
*/
- status_t writeToParcel(/*out*/Parcel* parcel) const;
+ status_t writeToParcel(
+ /*out*/
+ Parcel* parcel) const;
// Static methods:
@@ -93,7 +95,7 @@
*
* Returns OK on success, or a negative error code.
*/
- static status_t setAsGlobalVendorTagDescriptor(sp<VendorTagDescriptor>& desc);
+ static status_t setAsGlobalVendorTagDescriptor(const sp<VendorTagDescriptor>& desc);
/**
* Clears the global vendor tag descriptor used by this process.