commit f9b3e6a76ea6f6b419dfdb1cdc8358814e397a50
author Eino-Ville Talvala <etalvala@google.com> Mon Jun 24 17:45:51 2024 -0700
committer Pirama Arumuga Nainar <pirama@google.com> Thu Aug 08 18:01:42 2024 +0000
tree 0fa19fde13f2ea956bb560fc7670dff6f0a4761d
parent 9dea4710062703d8adb3a584bcc8a01998452c88

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

Bug: 358380079
Test: Builds
Flag: EXEMPT refactoring
Change-Id: I9f6560f7fe893654aba5fe12fea8e14d326e5a28
Merged-In: I9f6560f7fe893654aba5fe12fea8e14d326e5a28
(cherry picked from commit b772320e92339fd259790ae2a2b28e2aa120b953)

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 6416c11..2440c37 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -51,6 +51,7 @@
 
 #include "api2/HeicCompositeStream.h"
 #include "device3/ZoomRatioMapper.h"
+#include "utils/Utils.h"
 
 namespace android {
 
@@ -92,7 +93,7 @@
         case TorchModeStatus::AVAILABLE_ON:
             return "AVAILABLE_ON";
     }
-    ALOGW("Unexpected HAL torch mode status code %d", s);
+    ALOGW("Unexpected HAL torch mode status code %d", eToI(s));
     return "UNKNOWN_STATUS";
 }
 
@@ -105,7 +106,7 @@
         case CameraDeviceStatus::ENUMERATING:
             return "ENUMERATING";
     }
-    ALOGW("Unexpected HAL device status code %d", s);
+    ALOGW("Unexpected HAL device status code %d", eToI(s));
     return "UNKNOWN_STATUS";
 }
 
@@ -2279,7 +2280,7 @@
                         return tryToInitializeAidlProviderLocked(removedAidlProviderName,
                                 providerInfo);
                     default:
-                        ALOGE("%s Unsupported Transport %d", __FUNCTION__, providerTransport);
+                        ALOGE("%s Unsupported Transport %d", __FUNCTION__, eToI(providerTransport));
                 }
             }
         }
@@ -2366,7 +2367,7 @@
             }
             break;
         default:
-            ALOGE("%s Invalid transport %d", __FUNCTION__, transport);
+            ALOGE("%s Invalid transport %d", __FUNCTION__, eToI(transport));
             return BAD_VALUE;
     }
 
@@ -2712,7 +2713,7 @@
         }
         if (!known) {
             ALOGW("Camera provider %s says an unknown camera %s now has torch status %d. Curious.",
-                    mProviderName.c_str(), cameraDeviceName.c_str(), newStatus);
+                mProviderName.c_str(), cameraDeviceName.c_str(), eToI(newStatus));
             return;
         }
         // no lock needed since listener is set up only once during