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

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

Snap for 11432641 from b6edb15d to 24Q2-release 

Change-Id: Ifd7d98791b57f4af7979990d6e6f43afea87d874
parents 8b642b0b b6edb15d

camera/camera_platform.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -104,3 +104,10 @@ flag { 
     description: "Enable returning graphics buffers to buffer queues without holding the in-flight mutex"

     bug: "315526878"

}



flag {

     namespace: "camera_platform"

     name: "privacy_allowlist"

     description: "Allowlisting to exempt safety-relevant cameras from privacy control for automotive devices"

     bug: "282814430"

}

include/media/Interpolator.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public: 
            mInterpolatorType = interpolatorType;

            return NO_ERROR;

        default:

            ALOGE("invalid interpolatorType: %d", interpolatorType);

            ALOGE("invalid interpolatorType: %d", static_cast<int>(interpolatorType));

            return BAD_VALUE;

        }

    }

media/audio/aconfig/audiopolicy_framework.aconfig

+24 −0
Original line number Diff line number Diff line
@@ -5,6 +5,22 @@ 


package: "android.media.audiopolicy"



flag {

    name: "audio_mix_ownership"

    namespace: "media_audio"

    description: "Improves ownership model of AudioMixes and the relationship between AudioPolicy and AudioMix."

    bug: "309080867"

    is_fixed_read_only: true

}



flag {

    name: "audio_mix_policy_ordering"

    namespace: "media_audio"

    description: "Orders AudioMixes per registered AudioPolicy."

    bug: "309080867"

    is_fixed_read_only: true

}



flag {

    name: "audio_mix_test_api"

    namespace: "media_audio"
@@ -33,3 +49,11 @@ flag { 
    description: "Enable multi-zone audio support in audio product strategies."

    bug: "316643994"

}



flag {

    name: "record_audio_device_aware_permission"

    namespace: "media_audio"

    description: "Enable device-aware permission handling for RECORD_AUDIO permission"

    bug: "291737188"

    is_fixed_read_only: true

}
 
 No newline at end of file

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ ConversionResult<audio_channel_mask_t> aidl2legacy_AudioChannelLayout_audio_chan 
        case Tag::voiceMask:

            return convert(aidl, mVoice, __func__, "voice");

    }

    ALOGE("%s: unexpected tag value %d", __func__, aidl.getTag());

    ALOGE("%s: unexpected tag value %d", __func__, static_cast<int>(aidl.getTag()));

    return unexpected(BAD_VALUE);

}

media/libaudiofoundation/AudioPort.cpp

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ void AudioPort::dump(std::string *dst, int spaces, const char* extraInfo, bool v 
                dst->append(

                        base::StringPrintf("%*s extra audio descriptor %zu:\n", eadSpaces, "", i));

                dst->append(base::StringPrintf(

                    "%*s- standard: %u\n", descSpaces, "", mExtraAudioDescriptors[i].standard));

                        "%*s- standard: %u\n", descSpaces, "",

                        static_cast<unsigned>(mExtraAudioDescriptors[i].standard)));

                dst->append(base::StringPrintf("%*s- descriptor:", descSpaces, ""));

                for (auto v : mExtraAudioDescriptors[i].audioDescriptor) {

                    dst->append(base::StringPrintf(" %02x", v));