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

Commit 0cd02e6c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7584485 from 001d1473 to sc-release 

Change-Id: I1e7cd4b86d96312478c702efbba6a1c56c929620
parents 0c8a3535 001d1473

media/libaudioclient/IAudioFlinger.cpp

+7 −2
Original line number Diff line number Diff line
@@ -665,7 +665,11 @@ status_t AudioFlingerClientAdapter::getAudioPort(struct audio_port_v7* port) { 
status_t AudioFlingerClientAdapter::createAudioPatch(const struct audio_patch* patch,

                                                     audio_patch_handle_t* handle) {

    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_AudioPatch(*patch));

    int32_t aidlRet;

    int32_t aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(

                    AUDIO_PATCH_HANDLE_NONE));

    if (handle != nullptr) {

        aidlRet = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(*handle));

    }

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->createAudioPatch(patchAidl, &aidlRet)));

    if (handle != nullptr) {
@@ -1140,7 +1144,8 @@ Status AudioFlingerServerAdapter::getAudioPort(const media::AudioPort& port, 
Status AudioFlingerServerAdapter::createAudioPatch(const media::AudioPatch& patch,

                                                   int32_t* _aidl_return) {

    audio_patch patchLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioPatch_audio_patch(patch));

    audio_patch_handle_t handleLegacy;

    audio_patch_handle_t handleLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_int32_t_audio_patch_handle_t(*_aidl_return));

    RETURN_BINDER_IF_ERROR(mDelegate->createAudioPatch(&patchLegacy, &handleLegacy));

    *_aidl_return = VALUE_OR_RETURN_BINDER(legacy2aidl_audio_patch_handle_t_int32_t(handleLegacy));

    return Status::ok();

services/camera/libcameraservice/device3/Camera3Device.cpp

+13 −6
Original line number Diff line number Diff line
@@ -2450,9 +2450,9 @@ sp<Camera3Device::CaptureRequest> Camera3Device::createCaptureRequest( 


        auto testPatternDataEntry =

                newRequest->mSettingsList.begin()->metadata.find(ANDROID_SENSOR_TEST_PATTERN_DATA);

        if (testPatternDataEntry.count > 0) {

            memcpy(newRequest->mOriginalTestPatternData, testPatternModeEntry.data.i32,

                    sizeof(newRequest->mOriginalTestPatternData));

        if (testPatternDataEntry.count >= 4) {

            memcpy(newRequest->mOriginalTestPatternData, testPatternDataEntry.data.i32,

                    sizeof(CaptureRequest::mOriginalTestPatternData));

        } else {

            newRequest->mOriginalTestPatternData[0] = 0;

            newRequest->mOriginalTestPatternData[1] = 0;
@@ -5829,6 +5829,13 @@ bool Camera3Device::RequestThread::overrideTestPattern( 
        const sp<CaptureRequest> &request) {

    ATRACE_CALL();



    {

        sp<Camera3Device> parent = mParent.promote();

        if (parent != nullptr) {

            if (!parent->supportsCameraMute()) return false;

        }

    }



    Mutex::Autolock l(mTriggerMutex);



    bool changed = false;
@@ -5864,16 +5871,16 @@ bool Camera3Device::RequestThread::overrideTestPattern( 
    }



    auto testPatternColor = metadata.find(ANDROID_SENSOR_TEST_PATTERN_DATA);

    if (testPatternColor.count > 0) {

    if (testPatternColor.count >= 4) {

        for (size_t i = 0; i < 4; i++) {

            if (testPatternColor.data.i32[i] != (int32_t)testPatternData[i]) {

            if (testPatternColor.data.i32[i] != testPatternData[i]) {

                testPatternColor.data.i32[i] = testPatternData[i];

                changed = true;

            }

        }

    } else {

        metadata.update(ANDROID_SENSOR_TEST_PATTERN_DATA,

                (int32_t*)testPatternData, 4);

                testPatternData, 4);

        changed = true;

    }