diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 10:14:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-22 10:14:43 -0700 |
| commit | 87cebadd48710e42474756fc3513df678de045ce (patch) | |
| tree | 6f8a07d9ec9b4ebad70367430190a689cb1a5db3 /camera | |
| parent | 77a3374a6170fb5f0168169bc4bc3fa9baf318eb (diff) | |
| parent | f285c91efbae23783fe94dc5ad19a2560e157685 (diff) | |
| download | frameworks_av-87cebadd48710e42474756fc3513df678de045ce.zip frameworks_av-87cebadd48710e42474756fc3513df678de045ce.tar.gz frameworks_av-87cebadd48710e42474756fc3513df678de045ce.tar.bz2 | |
resolved conflicts for merge of f285c91e to master
Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/VendorTagDescriptor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/VendorTagDescriptor.cpp b/camera/VendorTagDescriptor.cpp index 59dce91..3f72f34 100644 --- a/camera/VendorTagDescriptor.cpp +++ b/camera/VendorTagDescriptor.cpp @@ -349,18 +349,18 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const { size_t size = mTagToNameMap.size(); if (size == 0) { - fdprintf(fd, "%*sDumping configured vendor tag descriptors: None set\n", + dprintf(fd, "%*sDumping configured vendor tag descriptors: None set\n", indentation, ""); return; } - fdprintf(fd, "%*sDumping configured vendor tag descriptors: %zu entries\n", + dprintf(fd, "%*sDumping configured vendor tag descriptors: %zu entries\n", indentation, "", size); for (size_t i = 0; i < size; ++i) { uint32_t tag = mTagToNameMap.keyAt(i); if (verbosity < 1) { - fdprintf(fd, "%*s0x%x\n", indentation + 2, "", tag); + dprintf(fd, "%*s0x%x\n", indentation + 2, "", tag); continue; } String8 name = mTagToNameMap.valueAt(i); @@ -369,7 +369,7 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const { int type = mTagToTypeMap.valueFor(tag); const char* typeName = (type >= 0 && type < NUM_TYPES) ? camera_metadata_type_names[type] : "UNKNOWN"; - fdprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2, + dprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2, "", tag, name.string(), type, typeName, sectionName.string()); } |