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

Commit a2a915b5 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioPolicy: engineconfigurable: WA to 32bits limit criterion" am:... 

Merge "AudioPolicy: engineconfigurable: WA to 32bits limit criterion" am: 7dc81400 am: 00475c9c am: 4fbf32fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1714004

Change-Id: I881015db8c4abc2435eb29490832573466b0e332
parents 8fb7268e 4fbf32fb

services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py

+8 −1
Original line number Diff line number Diff line
@@ -200,6 +200,11 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile, androidaudiocommonbasehead 
    #

    ignored_values = ['CNT', 'MAX', 'ALL', 'NONE']



    #

    # Reaching 32 bit limit for inclusive criterion out devices: removing

    #

    ignored_output_device_values = ['BleSpeaker', 'BleHeadset']



    criteria_pattern = re.compile(

        r"\s*V\((?P<type>(?:"+'|'.join(criterion_mapping_table.keys()) + "))_" \

        r"(?P<literal>(?!" + '|'.join(ignored_values) + ")\w*)\s*,\s*" \
@@ -235,7 +240,9 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile, androidaudiocommonbasehead 
            if criterion_name == "OutputDevicesMaskType":

                if criterion_literal == "Default":

                    criterion_numerical_value = str(int("0x40000000", 0))



                if criterion_literal in ignored_output_device_values:

                    logging.info("OutputDevicesMaskType skipping {}".format(criterion_literal))

                    continue

            try:

                string_int = int(criterion_numerical_value, 0)

            except ValueError: