commit 240201e27b1722009907a31983825668f2416ec2
author Treehugger Robot <treehugger-gerrit@google.com> Sat Dec 16 00:03:09 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 16 00:03:09 2017 +0000
tree 0ad9f94e7bcad9e0afe2bf339d8594e812a7ef0c
parent 8ef5c3d27484bee4a64210de17e18f001469ed96
parent 0f414de66cda78cd019df9f791cb17889cfc8bca

Merge "Use %d for int32_t"

media/libaaudio/src/utility/AAudioUtilities.cpp

diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp
index 2450920..612ad27 100644
--- a/media/libaaudio/src/utility/AAudioUtilities.cpp
+++ b/media/libaaudio/src/utility/AAudioUtilities.cpp
@@ -323,7 +323,7 @@
     const int32_t maxBytesPerFrame = maxChannels * sizeof(float);
     // Prevent overflow by limiting multiplicands.
     if (bytesPerFrame > maxBytesPerFrame || numFrames > (0x3FFFFFFF / maxBytesPerFrame)) {
-        ALOGE("size overflow, numFrames = %d, frameSize = %zd", numFrames, bytesPerFrame);
+        ALOGE("size overflow, numFrames = %d, frameSize = %d", numFrames, bytesPerFrame);
         return AAUDIO_ERROR_OUT_OF_RANGE;
     }
     *sizeInBytes = numFrames * bytesPerFrame;

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index c03e8a2..09c2d82 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -668,7 +668,7 @@
 
     if (mInputStream.configured) {
         String8 msg = String8::format("Camera %s: Already has an input stream "
-                "configured (ID %zd)", mCameraIdStr.string(), mInputStream.id);
+                "configured (ID %d)", mCameraIdStr.string(), mInputStream.id);
         ALOGE("%s: %s", __FUNCTION__, msg.string() );
         return STATUS_ERROR(CameraService::ERROR_ALREADY_EXISTS, msg.string());
     }