Merge "Use %d for int32_t" am: 240201e27b

am: 63c04ff2b7

Change-Id: Ie30c55232b8b228fab1de5d827dc1bcf29c0f4a7

media/libaaudio/src/utility/AAudioUtilities.cpp

@@ -323,7 +323,7 @@ int32_t AAudioConvert_framesToBytes(int32_t numFrames,
     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

@@ -668,7 +668,7 @@ binder::Status CameraDeviceClient::createInputStream(
 
     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());
     }