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

Commit 06c65bdd authored by Francois Gaffie's avatar Francois Gaffie Committed by Eric Laurent
Browse files

Revert "AudioPolicy: engineconfigurable: WA to 32bits limit criterion" 

This WA was a quick fix to enable the build on Android 12.
However, it leads to making some devices unavailable when using
engine configurable, thus impacting some teams (e.g. TV)

This reverts commit 07f30316.

Bug: 189469490
Test: make

Change-Id: Iafe3386279f40cced008141af1252a3c103725d4
parent 63697e06

services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py

+1 −8
Original line number Diff line number Diff line
@@ -200,11 +200,6 @@ 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*" \
@@ -240,9 +235,7 @@ 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: