Camera2: Improve formatting of debugging dump

Bug: 6243944
Change-Id: Id8730357f3adcd96923132f9f702e296e0dfd357
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 @@
 
     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 @@
              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 @@
              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++;
         }
     }