diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-05 17:40:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 17:40:09 +0000 |
commit | f2776a5692bb4228decbe4ea3c8cc6df1d9c684c (patch) | |
tree | de826271c5cd7aaabb8c587b5a9e501ecf779228 /services/camera | |
parent | 6640d87d1a9263c12bab6d7ded7cc78a3eb50ae9 (diff) | |
parent | f81648ec38ff63f1f35516fa27c1c24d846e9ba5 (diff) | |
download | frameworks_av-f2776a5692bb4228decbe4ea3c8cc6df1d9c684c.zip frameworks_av-f2776a5692bb4228decbe4ea3c8cc6df1d9c684c.tar.gz frameworks_av-f2776a5692bb4228decbe4ea3c8cc6df1d9c684c.tar.bz2 |
Merge "camera3: Update CameraMetadata vendor tag handling."
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 c6b4670..fe1e707 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1262,7 +1262,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; @@ -1287,7 +1300,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()); } |