diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-05-03 00:29:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-03 00:29:04 +0000 |
| commit | fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9 (patch) | |
| tree | 8c35d32339aef06d77648a8fa7961d058e8356f9 /services/camera | |
| parent | 6c516d800d97b7f25a22574998cb055c9d7f7b16 (diff) | |
| parent | 6770260f83f5576b041b7b3a2536d082a631f9b0 (diff) | |
| download | frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.zip frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.gz frameworks_av-fa366b2a32294ea22bf7b6f237cdbbd715cbbeb9.tar.bz2 | |
Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 9001b3a..02bca1f 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -1257,20 +1257,7 @@ 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; @@ -1295,7 +1282,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, /*verbosity*/2, /*indentation*/4); + fd, 2, 4); } else { write(fd, result.string(), result.size()); } |