commit b772320e92339fd259790ae2a2b28e2aa120b953
author Eino-Ville Talvala <etalvala@google.com> Mon Jun 24 17:45:51 2024 -0700
committer Eino-Ville Talvala <etalvala@google.com> Tue Jun 25 09:43:59 2024 -0700
tree 9fb8a8659f411e4c5bc411e828810918c6a11476
parent 2e4fe31da66dd626dc9f9c81e683b8abc6ffa939

Camera: Fix assorted deprecation and formatting warnings

- Remove deprecated iterator base class from RingBuffer's iterator
- Backport C++23's enum to_underlying() function and use it to fix
  a pile of formatting conversion warnings when logging enum values
- Also fix a few other formatting specifiers

Test: Builds
Flag: EXEMPT refactoring
Change-Id: I9f6560f7fe893654aba5fe12fea8e14d326e5a28

services/camera/libcameraservice/aidl/AidlUtils.cpp

diff --git a/services/camera/libcameraservice/aidl/AidlUtils.cpp b/services/camera/libcameraservice/aidl/AidlUtils.cpp
index d23566c..1ec5072 100644
--- a/services/camera/libcameraservice/aidl/AidlUtils.cpp
+++ b/services/camera/libcameraservice/aidl/AidlUtils.cpp
@@ -26,6 +26,7 @@
 #include <device3/Camera3StreamInterface.h>
 #include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
 #include <mediautils/AImageReaderUtils.h>
+#include "utils/Utils.h"
 
 namespace android::hardware::cameraservice::utils::conversion::aidl {
 
@@ -347,8 +348,8 @@
     // Ensure the vendor ID are the same before attempting
     // anything else. If vendor IDs differ we cannot safely copy the characteristics.
     if (from.getVendorId() != to->getVendorId()) {
-        ALOGE("%s: Incompatible CameraMetadata objects. Vendor IDs differ. From: %lu; To: %lu",
-              __FUNCTION__, from.getVendorId(), to->getVendorId());
+        ALOGE("%s: Incompatible CameraMetadata objects. Vendor IDs differ. From: %" PRIu64
+              "; To: %" PRIu64, __FUNCTION__, from.getVendorId(), to->getVendorId());
         return BAD_VALUE;
     }
 
@@ -364,7 +365,7 @@
     for (size_t i = 0; i < get_camera_metadata_entry_count(src); i++) {
         int ret = get_camera_metadata_ro_entry(src, i, &entry);
         if (ret != OK) {
-            ALOGE("%s: Could not fetch entry at index %lu. Error: %d", __FUNCTION__, i, ret);
+            ALOGE("%s: Could not fetch entry at index %zu. Error: %d", __FUNCTION__, i, ret);
             from.unlock(src);
             return BAD_VALUE;
         }