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 --- include/camera/ICameraService.h | 10 +++++++--- include/camera/VendorTagDescriptor.h | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'include/camera') 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 @@ public: 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& desc) = 0; + virtual status_t getCameraVendorTagDescriptor( + /*out*/ + sp& 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 @@ class VendorTagDescriptor * * 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 @@ class VendorTagDescriptor * * Returns OK on success, or a negative error code. */ - static status_t setAsGlobalVendorTagDescriptor(sp& desc); + static status_t setAsGlobalVendorTagDescriptor(const sp& desc); /** * Clears the global vendor tag descriptor used by this process. -- cgit v1.1