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

Commit adb1196c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audiopolicy: capengine: remove unecessary numerical value computing"... 

Merge "audiopolicy: capengine: remove unecessary numerical value computing" into main am: ab3a0423 am: 3a37f056

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



Change-Id: I97cec52251505653c4f7ce165625ba474a559956
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6dc8e3e 3a37f056

services/audiopolicy/engineconfigurable/tools/capBuildPolicyCriterionTypes.py

+0 −18
Original line number Diff line number Diff line
@@ -237,15 +237,6 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile, androidaudiocommonbasehead 
                        # Append AUDIO_DEVICE_IN for android type tag

                        input_devices_type_value[criterion_literal] = hex(string_int | 2147483648)



                        num_bits = bin(string_int).count("1")

                        if num_bits > 1:

                            logging.info("The value {}:{} is for criterion {} binary rep {} has {} bits sets"

                                .format(criterion_numerical_value, criterion_literal, criterion_name, bin(string_int), num_bits))

                            string_int = 2**multi_bit_inputdevice_shift

                            logging.info("new val assigned is {} {}" .format(string_int, bin(string_int)))

                            multi_bit_inputdevice_shift += 1

                            criterion_numerical_value = str(string_int)



                    except ValueError:

                        # Handle the exception

                        logging.info("value {}:{} for criterion {} is not a number, ignoring"
@@ -261,15 +252,6 @@ def parseAndroidAudioFile(androidaudiobaseheaderFile, androidaudiocommonbasehead 
                        string_int = int(criterion_numerical_value, 0)

                        output_devices_type_value[criterion_literal] = criterion_numerical_value



                        num_bits = bin(string_int).count("1")

                        if num_bits > 1:

                            logging.info("The value {}:{} is for criterion {} binary rep {} has {} bits sets"

                                .format(criterion_numerical_value, criterion_literal, criterion_name, bin(string_int), num_bits))

                            string_int = 2**multi_bit_outputdevice_shift

                            logging.info("new val assigned is {} {}" .format(string_int, bin(string_int)))

                            multi_bit_outputdevice_shift += 1

                            criterion_numerical_value = str(string_int)



                    except ValueError:

                        # Handle the exception

                        logging.info("The value {}:{} is for criterion {} is not a number, ignoring"