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

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

Merge "Use %d for int32_t" 

am: 240201e2

Change-Id: I309c8308b674bfdf16fca7a04fd2627ab6e99c40
parents c6b02f78 240201e2

media/libaaudio/src/utility/AAudioUtilities.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -323,7 +323,7 @@ int32_t AAudioConvert_framesToBytes(int32_t numFrames, 
    const int32_t maxBytesPerFrame = maxChannels * sizeof(float);

    const int32_t maxBytesPerFrame = maxChannels * sizeof(float);

    // Prevent overflow by limiting multiplicands.

    // Prevent overflow by limiting multiplicands.

    if (bytesPerFrame > maxBytesPerFrame || numFrames > (0x3FFFFFFF / maxBytesPerFrame)) {

    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;

        return AAUDIO_ERROR_OUT_OF_RANGE;

    }

    }

    *sizeInBytes = numFrames * bytesPerFrame;

    *sizeInBytes = numFrames * bytesPerFrame;

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -668,7 +668,7 @@ binder::Status CameraDeviceClient::createInputStream( 




    if (mInputStream.configured) {

    if (mInputStream.configured) {

        String8 msg = String8::format("Camera %s: Already has an input stream "

        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() );

        ALOGE("%s: %s", __FUNCTION__, msg.string() );

        return STATUS_ERROR(CameraService::ERROR_ALREADY_EXISTS, msg.string());

        return STATUS_ERROR(CameraService::ERROR_ALREADY_EXISTS, msg.string());

    }

    }