diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-04-17 16:14:57 -0700 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2014-05-02 20:33:45 -0700 |
commit | f81648ec38ff63f1f35516fa27c1c24d846e9ba5 (patch) | |
tree | 826a0e862b52bbbe22586c08693569dee723f5ff /services/camera | |
parent | fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 (diff) | |
download | frameworks_av-f81648ec38ff63f1f35516fa27c1c24d846e9ba5.zip frameworks_av-f81648ec38ff63f1f35516fa27c1c24d846e9ba5.tar.gz frameworks_av-f81648ec38ff63f1f35516fa27c1c24d846e9ba5.tar.bz2 |
camera3: Update CameraMetadata vendor tag handling.
Bug: 12134423
Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
Diffstat (limited to 'services/camera')
-rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 02bca1f..9001b3a 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1257,7 +1257,20 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { result.appendFormat("Camera module author: %s\n", mModule->common.author); result.appendFormat("Number of camera devices: %d\n\n", mNumberOfCameras); + + sp<VendorTagDescriptor> desc = VendorTagDescriptor::getGlobalVendorTagDescriptor(); + if (desc == NULL) { + result.appendFormat("Vendor tags left unimplemented.\n"); + } else { + result.appendFormat("Vendor tag definitions:\n"); + } + write(fd, result.string(), result.size()); + + if (desc != NULL) { + desc->dump(fd, /*verbosity*/2, /*indentation*/4); + } + for (int i = 0; i < mNumberOfCameras; i++) { result = String8::format("Camera %d static information:\n", i); camera_info info; @@ -1282,7 +1295,7 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) { result.appendFormat(" Device static metadata:\n"); write(fd, result.string(), result.size()); dump_indented_camera_metadata(info.static_camera_characteristics, - fd, 2, 4); + fd, /*verbosity*/2, /*indentation*/4); } else { write(fd, result.string(), result.size()); } |