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

Commit 7ba46558 authored by Phil Burk's avatar Phil Burk
Browse files

aaudio: reduce error logging, improve security 

Reduce log spam and error logging as part of the Green Log effort.
Replace logging of addresses with integer IDs.

Bug: 36785118
Bug: 122073229
Bug: 130569151
Test: Open an AAudio stream at 44100 and look at logcat.
Test:   adb shell write_sine_callback -pl -r44100
Test:   adb logcat | grep -i aaudio | grep " E "
Test: Should see no "E" logs from AAudio.
Test: Should see no addresses from AAudio.
Change-Id: I1d4e0bc349095f818fad52603d2bb8e7317d3681
parent 8946fa33

media/libaaudio/src/binding/AAudioBinderClient.cpp

+1 −2
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ const sp<IAAudioService> AAudioBinderClient::getAAudioService() { 
                status_t status = binder->linkToDeath(mAAudioClient);

                // TODO review what we should do if this fails

                if (status != NO_ERROR) {

                    ALOGE("getAAudioService: linkToDeath(mAAudioClient = %p) returned %d",

                          mAAudioClient.get(), status);

                    ALOGE("%s() - linkToDeath() returned %d", __func__, status);

                }

                mAAudioService = interface_cast<IAAudioService>(binder);

                needToRegister = true;

media/libaaudio/src/binding/SharedMemoryParcelable.cpp

+0 −1
Original line number Diff line number Diff line
@@ -157,5 +157,4 @@ aaudio_result_t SharedMemoryParcelable::validate() const { 
void SharedMemoryParcelable::dump() {

    ALOGD("mFd = %d", mFd.get());

    ALOGD("mSizeInBytes = %d", mSizeInBytes);

    ALOGD("mResolvedAddress = %p", mResolvedAddress);

}

media/libaaudio/src/client/AAudioFlowGraph.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ aaudio_result_t AAudioFlowGraph::configure(audio_format_t sourceFormat, 
                          int32_t sinkChannelCount) {

    AudioFloatOutputPort *lastOutput = nullptr;



    ALOGD("%s() source format = 0x%08x, channels = %d, sink format = 0x%08x, channels = %d",

    ALOGV("%s() source format = 0x%08x, channels = %d, sink format = 0x%08x, channels = %d",

          __func__, sourceFormat, sourceChannelCount, sinkFormat, sinkChannelCount);



    switch (sourceFormat) {

media/libaaudio/src/client/AudioStreamInternal.cpp

+11 −11
Original line number Diff line number Diff line
@@ -195,13 +195,13 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 
    if (isDataCallbackSet()) {

        mCallbackFrames = builder.getFramesPerDataCallback();

        if (mCallbackFrames > getBufferCapacity() / 2) {

            ALOGE("%s - framesPerCallback too big = %d, capacity = %d",

            ALOGW("%s - framesPerCallback too big = %d, capacity = %d",

                  __func__, mCallbackFrames, getBufferCapacity());

            result = AAUDIO_ERROR_OUT_OF_RANGE;

            goto error;



        } else if (mCallbackFrames < 0) {

            ALOGE("%s - framesPerCallback negative", __func__);

            ALOGW("%s - framesPerCallback negative", __func__);

            result = AAUDIO_ERROR_OUT_OF_RANGE;

            goto error;
@@ -225,7 +225,7 @@ error: 


aaudio_result_t AudioStreamInternal::close() {

    aaudio_result_t result = AAUDIO_OK;

    ALOGD("%s(): mServiceStreamHandle = 0x%08X", __func__, mServiceStreamHandle);

    ALOGV("%s(): mServiceStreamHandle = 0x%08X", __func__, mServiceStreamHandle);

    if (mServiceStreamHandle != AAUDIO_HANDLE_INVALID) {

        // Don't close a stream while it is running.

        aaudio_stream_state_t currentState = getState();
@@ -236,7 +236,7 @@ aaudio_result_t AudioStreamInternal::close() { 
            result = waitForStateChange(currentState, &nextState,

                                                       timeoutNanoseconds);

            if (result != AAUDIO_OK) {

                ALOGE("%s() waitForStateChange() returned %d %s",

                ALOGW("%s() waitForStateChange() returned %d %s",

                __func__, result, AAudio_convertResultToText(result));

            }

        }
@@ -283,17 +283,17 @@ aaudio_result_t AudioStreamInternal::requestStart() 
{

    int64_t startTime;

    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("requestStart() mServiceStreamHandle invalid");

        ALOGD("requestStart() mServiceStreamHandle invalid");

        return AAUDIO_ERROR_INVALID_STATE;

    }

    if (isActive()) {

        ALOGE("requestStart() already active");

        ALOGD("requestStart() already active");

        return AAUDIO_ERROR_INVALID_STATE;

    }



    aaudio_stream_state_t originalState = getState();

    if (originalState == AAUDIO_STREAM_STATE_DISCONNECTED) {

        ALOGE("requestStart() but DISCONNECTED");

        ALOGD("requestStart() but DISCONNECTED");

        return AAUDIO_ERROR_DISCONNECTED;

    }

    setState(AAUDIO_STREAM_STATE_STARTING);
@@ -356,8 +356,8 @@ aaudio_result_t AudioStreamInternal::requestStop() { 
    }



    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("requestStopInternal() mServiceStreamHandle invalid = 0x%08X",

              mServiceStreamHandle);

        ALOGW("%s() mServiceStreamHandle invalid = 0x%08X",

              __func__, mServiceStreamHandle);

        return AAUDIO_ERROR_INVALID_STATE;

    }
@@ -370,7 +370,7 @@ aaudio_result_t AudioStreamInternal::requestStop() { 


aaudio_result_t AudioStreamInternal::registerThread() {

    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("registerThread() mServiceStreamHandle invalid");

        ALOGW("%s() mServiceStreamHandle invalid", __func__);

        return AAUDIO_ERROR_INVALID_STATE;

    }

    return mServiceInterface.registerAudioThread(mServiceStreamHandle,
@@ -380,7 +380,7 @@ aaudio_result_t AudioStreamInternal::registerThread() { 


aaudio_result_t AudioStreamInternal::unregisterThread() {

    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("unregisterThread() mServiceStreamHandle invalid");

        ALOGW("%s() mServiceStreamHandle invalid", __func__);

        return AAUDIO_ERROR_INVALID_STATE;

    }

    return mServiceInterface.unregisterAudioThread(mServiceStreamHandle, gettid());

media/libaaudio/src/client/AudioStreamInternalPlay.cpp

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ aaudio_result_t AudioStreamInternalPlay::requestPause() 
        return result;

    }

    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("%s() mServiceStreamHandle invalid", __func__);

        ALOGW("%s() mServiceStreamHandle invalid", __func__);

        return AAUDIO_ERROR_INVALID_STATE;

    }
@@ -77,7 +77,7 @@ aaudio_result_t AudioStreamInternalPlay::requestPause() 


aaudio_result_t AudioStreamInternalPlay::requestFlush() {

    if (mServiceStreamHandle == AAUDIO_HANDLE_INVALID) {

        ALOGE("%s() mServiceStreamHandle invalid", __func__);

        ALOGW("%s() mServiceStreamHandle invalid", __func__);

        return AAUDIO_ERROR_INVALID_STATE;

    }