commit d4638e74c77cc592fae35dd0ab823e91b0e0469e
author Cheng Gu <gucheng@google.com> Wed Jul 27 09:00:12 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Aug 08 14:30:05 2022 +0000
tree bd33427ae7ae6a38caec0e0e37092bc2dbad70af
parent 7964403a81a6883c4bfd7cac602941146a77a737

realtime_zsl: Fix breakage due to portability

Bug: 240347618
Test: presubmit
Change-Id: I907173b7ad5ee3f4d8498fbefe510aa89bb92688
(cherry picked from commit 789eb838415a0494c9555946ca91a67d0c4ff645)
Merged-In: I907173b7ad5ee3f4d8498fbefe510aa89bb92688

common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc

diff --git a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
index 8edc17d..be455eb 100644
--- a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
+++ b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
@@ -104,7 +104,7 @@
   // May change to ALOGD for per-frame results.
   ALOGV(
       "%s: Received result at frame: %d, has metadata (%s), output buffer "
-      "counts: %lu, input buffer counts: %lu",
+      "counts: %zu, input buffer counts: %zu",
       __FUNCTION__, result->frame_number,
       (result->result_metadata ? "yes" : "no"), result->output_buffers.size(),
       result->input_buffers.size());
@@ -344,12 +344,11 @@
     }
   } else {
     // May change to ALOGD for per-frame shutter messages.
-    ALOGV(
-        "%s: Received shutter message for frame %d, timestamp_ns: %lu, "
-        "readout_timestamp_ns: %lu",
-        __FUNCTION__, message.message.shutter.frame_number,
-        message.message.shutter.timestamp_ns,
-        message.message.shutter.readout_timestamp_ns);
+    ALOGV("%s: Received shutter message for frame %d, timestamp_ns: %" PRId64
+          ", readout_timestamp_ns: %" PRId64,
+          __FUNCTION__, message.message.shutter.frame_number,
+          message.message.shutter.timestamp_ns,
+          message.message.shutter.readout_timestamp_ns);
   }
   notify_(message);
 }