Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82326733 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Use %d for int32_t" am: 240201e2 am: 63c04ff2 

am: 6428a766

Change-Id: I8b601680923641d7aa7f7aabed4e072fb77a24e5
parents 65f69324 6428a766

media/libaaudio/src/utility/AAudioUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,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

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,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());

    }