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

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

Snap for 11661060 from c71fdea4 to 24Q3-release 

Change-Id: I62aa0c4a855a98be5d108176259f4950dc7adf8a
parents 10d08cd5 c71fdea4

audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ INSTANTIATE_TEST_SUITE_P( 
                    ::android::internal::ToString(std::get<INPUT_GAIN_PARAM>(info.param));

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_inputGains_" + gains;

                               toString(descriptor.common.id.uuid) + "_inputGains_" + gains;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -652,7 +652,7 @@ INSTANTIATE_TEST_SUITE_P( 
                    std::to_string(std::get<LIMITER_ENGINE_IN_USE>(info.param));

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_limiterConfig_" +

                               toString(descriptor.common.id.uuid) + "_limiterConfig_" +

                               cfg.toString() + "_engineSetting_" + engineLimiterInUse;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -726,7 +726,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_" + channelConfig +

                               toString(descriptor.common.id.uuid) + "_" + channelConfig +

                               "_engineInUse_" + engineInUse;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -868,7 +868,7 @@ INSTANTIATE_TEST_SUITE_P( 
            std::string stageInUse = std::to_string(std::get<EQ_BAND_STAGE_IN_USE>(info.param));

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_bands_" + bands +

                               toString(descriptor.common.id.uuid) + "_bands_" + bands +

                               "_stageInUse_" + stageInUse;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -986,7 +986,7 @@ INSTANTIATE_TEST_SUITE_P( 
            std::string stageInUse = std::to_string(std::get<MBC_BAND_STAGE_IN_USE>(info.param));

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_bands_" + mbcBands +

                               toString(descriptor.common.id.uuid) + "_bands_" + mbcBands +

                               "_stageInUse_" + stageInUse;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp

+8 −9
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_roomHfLevel" + roomHfLevel;

                               toString(descriptor.common.id.uuid) + "_roomHfLevel" + roomHfLevel;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -289,7 +289,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_decayTime" + decayTime;

                               toString(descriptor.common.id.uuid) + "_decayTime" + decayTime;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -329,8 +329,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_decayHfRatio" +

                               decayHfRatio;

                               toString(descriptor.common.id.uuid) + "_decayHfRatio" + decayHfRatio;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -370,7 +369,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_level" + level;

                               toString(descriptor.common.id.uuid) + "_level" + level;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -410,7 +409,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_delay" + delay;

                               toString(descriptor.common.id.uuid) + "_delay" + delay;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -450,7 +449,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_diffusion" + diffusion;

                               toString(descriptor.common.id.uuid) + "_diffusion" + diffusion;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -490,7 +489,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_density" + density;

                               toString(descriptor.common.id.uuid) + "_density" + density;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;
@@ -527,7 +526,7 @@ INSTANTIATE_TEST_SUITE_P( 


            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_bypass" + bypass;

                               toString(descriptor.common.id.uuid) + "_bypass" + bypass;

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ INSTANTIATE_TEST_SUITE_P( 
                    std::to_string(std::get<PARAM_VIBRATION_INFORMATION_MAX_AMPLITUDE>(info.param));

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString() + "_hapticScaleId" +

                               toString(descriptor.common.id.uuid) + "_hapticScaleId" +

                               hapticScaleID + "_hapticScaleVibScale" + hapticScaleVibScale +

                               "_resonantFrequency" + resonantFrequency + "_qFactor" + qFactor +

                               "_maxAmplitude" + maxAmplitude;
@@ -422,7 +422,7 @@ INSTANTIATE_TEST_SUITE_P( 
            auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second;

            std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +

                               descriptor.common.name + "_UUID_" +

                               descriptor.common.id.uuid.toString();

                               toString(descriptor.common.id.uuid);

            std::replace_if(

                    name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

            return name;

automotive/vehicle/aidl/emu_metadata/android.hardware.automotive.vehicle-types-meta.json

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 
            {

                "name": "EV_BRAKE_REGENERATION_LEVEL",

                "value": 289408012,

                "description": "Regenerative braking level of a electronic vehicle\nThe maxInt32Value and minInt32Value in VehicleAreaConfig must be defined. All values between minInt32Value and maxInt32Value must be supported. The minInt32Value must be 0.\nThe maxInt32Value indicates the maximum amount of energy regenerated from braking. The minInt32Value indicates no regenerative braking.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."

                "description": "Regenerative braking level of a electronic vehicle\nThe maxInt32Value and minInt32Value in VehicleAreaConfig must be defined. All values between minInt32Value and maxInt32Value must be supported. The minInt32Value must be 0.\nThe maxInt32Value indicates the setting for the maximum amount of energy regenerated from braking. The minInt32Value indicates the setting for no regenerative braking.\nThis property is a more granular form of EV_REGENERATIVE_BRAKING_STATE. It allows the user to set a more specific level of regenerative braking if the states in EvRegenerativeBrakingState are not granular enough for the OEM.\nThis property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to implement it as VehiclePropertyAccess.READ only."

            },

            {

                "name": "Warning for fuel low level.",
@@ -1296,7 +1296,7 @@ 
                    "EvRegenerativeBrakingState"

                ],

                "data_enum": "EvRegenerativeBrakingState",

                "description": "Regenerative braking or one-pedal drive state of the car\nReturns the current state associated with the regenerative braking setting in the car"

                "description": "Regenerative braking or one-pedal drive setting of the car\nReturns the current setting associated with the regenerative braking setting in the car\nIf the OEM requires more setting than those provided in EvRegenerativeBrakingState, the EV_BRAKE_REGENERATION_LEVEL property can be used instead, which provides a more granular way of providing the same information."

            },

            {

                "name": "TRAILER_PRESENT",

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleProperty.aidl

+12 −5
Original line number Diff line number Diff line
@@ -668,8 +668,12 @@ enum VehicleProperty { 
     * The maxInt32Value and minInt32Value in VehicleAreaConfig must be defined. All values between

     * minInt32Value and maxInt32Value must be supported. The minInt32Value must be 0.

     *

     * The maxInt32Value indicates the maximum amount of energy regenerated from braking. The

     * minInt32Value indicates no regenerative braking.

     * The maxInt32Value indicates the setting for the maximum amount of energy regenerated from

     * braking. The minInt32Value indicates the setting for no regenerative braking.

     *

     * This property is a more granular form of EV_REGENERATIVE_BRAKING_STATE. It allows the user to

     * set a more specific level of regenerative braking if the states in EvRegenerativeBrakingState

     * are not granular enough for the OEM.

     *

     * This property is defined as VehiclePropertyAccess.READ_WRITE, but OEMs have the option to

     * implement it as VehiclePropertyAccess.READ only.
@@ -4957,10 +4961,13 @@ enum VehicleProperty { 
            + 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32



    /**

     * Regenerative braking or one-pedal drive state of the car

     * Regenerative braking or one-pedal drive setting of the car

     *

     * Returns the current setting associated with the regenerative braking setting in the car

     *

     * Returns the current state associated with the regenerative braking

     * setting in the car

     * If the OEM requires more setting than those provided in EvRegenerativeBrakingState, the

     * EV_BRAKE_REGENERATION_LEVEL property can be used instead, which provides a more granular

     * way of providing the same information.

     *

     * @change_mode VehiclePropertyChangeMode.ON_CHANGE

     * @access VehiclePropertyAccess.READ