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 07f30316ef151527fa9c5b229006e11cd60a8bb9.
Bug: 189469490
Test: make
Change-Id: Iafe3386279f40cced008141af1252a3c103725d4
diff --git a/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py b/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
index 76c35c1..b5885c0 100755
--- a/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
+++ b/services/audiopolicy/engineconfigurable/tools/buildPolicyCriterionTypes.py
@@ -200,11 +200,6 @@
#
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 @@
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: