diff options
| author | Igor Murashkin <iam@google.com> | 2014-03-17 14:00:29 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2014-03-17 14:00:29 -0700 |
| commit | e1445da74730473a66a3ae8414e940aebfe6585d (patch) | |
| tree | 4156e14e4528fffe1ec29f48bffd78c2fcd0d786 /include | |
| parent | 1c2b6e5e9671a5ea9eb26d24b772bb26bfa6d107 (diff) | |
| download | frameworks_av-e1445da74730473a66a3ae8414e940aebfe6585d.zip frameworks_av-e1445da74730473a66a3ae8414e940aebfe6585d.tar.gz frameworks_av-e1445da74730473a66a3ae8414e940aebfe6585d.tar.bz2 | |
camera2: Don't log vendor tag errors when camera HAL too old
Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/ICameraService.h | 10 | ||||
| -rw-r--r-- | include/camera/VendorTagDescriptor.h | 6 |
2 files changed, 11 insertions, 5 deletions
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<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 @@ 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<VendorTagDescriptor>& desc); + static status_t setAsGlobalVendorTagDescriptor(const sp<VendorTagDescriptor>& desc); /** * Clears the global vendor tag descriptor used by this process. |