Camera2: Improve formatting of debugging dump

Bug: 6243944
Change-Id: Id8730357f3adcd96923132f9f702e296e0dfd357

3 files changed, 16 insertions, 6 deletions

diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 53e6638..62741d5 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -276,7 +276,7 @@ status_t Camera2Client::dump(int fd, const Vector<String16>& args) {
     if (mPreviewRequest != NULL) {
         result.append("    Preview request:\n");
         write(fd, result.string(), result.size());
-        dump_camera_metadata(mPreviewRequest, fd, 2);
+        dump_indented_camera_metadata(mPreviewRequest, fd, 2, 6);
     } else {
         result.append("    Preview request: undefined\n");
         write(fd, result.string(), result.size());
@@ -285,12 +285,21 @@ status_t Camera2Client::dump(int fd, const Vector<String16>& args) {
     if (mCaptureRequest != NULL) {
         result = "    Capture request:\n";
         write(fd, result.string(), result.size());
-        dump_camera_metadata(mCaptureRequest, fd, 2);
+        dump_indented_camera_metadata(mCaptureRequest, fd, 2, 6);
     } else {
         result = "    Capture request: undefined\n";
         write(fd, result.string(), result.size());
     }
 
+    if (mRecordingRequest != NULL) {
+        result = "    Recording request:\n";
+        write(fd, result.string(), result.size());
+        dump_indented_camera_metadata(mRecordingRequest, fd, 2, 6);
+    } else {
+        result = "    Recording request: undefined\n";
+        write(fd, result.string(), result.size());
+    }
+
     result = "  Device dump:\n";
     write(fd, result.string(), result.size());
 
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index f42e3a5..d760313 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -120,7 +120,7 @@ status_t Camera2Device::dump(int fd, const Vector<String16>& args) {
 
     result.appendFormat("    Static camera information metadata:\n");
     write(fd, result.string(), result.size());
-    dump_camera_metadata(mDeviceInfo, fd, 2);
+    dump_indented_camera_metadata(mDeviceInfo, fd, 2, 6);
 
     result = "    Request queue contents:\n";
     write(fd, result.string(), result.size());
@@ -487,7 +487,7 @@ status_t Camera2Device::MetadataQueue::dump(int fd,
              r != mStreamSlot.end(); r++) {
             result = String8::format("       Stream slot buffer %d:\n", i);
             write(fd, result.string(), result.size());
-            dump_camera_metadata(*r, fd, 2);
+            dump_indented_camera_metadata(*r, fd, 2, 10);
             i++;
         }
     }
@@ -502,7 +502,7 @@ status_t Camera2Device::MetadataQueue::dump(int fd,
              r != mEntries.end(); r++) {
             result = String8::format("       Queue entry %d:\n", i);
             write(fd, result.string(), result.size());
-            dump_camera_metadata(*r, fd, 2);
+            dump_indented_camera_metadata(*r, fd, 2, 10);
             i++;
         }
     }
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index a83c28f..878afde 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -472,7 +472,8 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) {
                 if (deviceVersion >= CAMERA_DEVICE_API_VERSION_2_0) {
                     result.appendFormat("  Device static metadata:\n");
                     write(fd, result.string(), result.size());
-                    dump_camera_metadata(info.static_camera_characteristics, fd, 2);
+                    dump_indented_camera_metadata(info.static_camera_characteristics,
+                            fd, 2, 4);
                 } else {
                     write(fd, result.string(), result.size());
                 }