From 6770260f83f5576b041b7b3a2536d082a631f9b0 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Sat, 3 May 2014 00:28:33 +0000 Subject: Revert "camera3: Update CameraMetadata vendor tag handling." This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76 --- services/camera/libcameraservice/CameraService.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'services') 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& args) { result.appendFormat("Camera module author: %s\n", mModule->common.author); result.appendFormat("Number of camera devices: %d\n\n", mNumberOfCameras); - - sp 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& 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()); } -- cgit v1.1