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

Commit fc5feb99 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ic75f61b4,Id4f9029c into main 

* changes:
  Prevent invalid escape sequence warning.
  Update doc for min/max value in VehicleAreaConfig.
parents 02d7541a 99e9ef3f

automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl

+24 −12
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ parcelable VehicleAreaConfig { 
     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     *

     * Only applicable for {@code INT32} type property. Ignored for other types.

     * Only applicable for {@code INT32} type property. For other types, must be

     * 0.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.
@@ -60,10 +61,13 @@ parcelable VehicleAreaConfig { 
     * boot time, both {@code minInt32Value} and {@code maxInt32Value} must be

     * set to 0.

     *

     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     * Note that this property only represents the maximum value at boot time

     * and may not represent the current actual maximum value.

     *

     * Only applicable for {@code INT32} type property. For other types, must be

     * 0.

     *

     * Only applicable for {@code INT32} type property. Ignored for other types.

     * Must be larger or equal to {@code minInt32Value}.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.
@@ -86,7 +90,8 @@ parcelable VehicleAreaConfig { 
     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     *

     * Only applicable for {@code INT64} type property. Ignored for other types.

     * Only applicable for {@code INT64} type property. For other types, must be

     * 0.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.
@@ -106,10 +111,13 @@ parcelable VehicleAreaConfig { 
     * boot time, both {@code minInt64Value} and {@code maxInt64Value} must be

     * set to 0.

     *

     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     * Note that this property only represents the maximum value at boot time

     * and may not represent the current actual maximum value.

     *

     * Only applicable for {@code INT64} type property. Ignored for other types.

     * Only applicable for {@code INT64} type property. For other types, must be

     * 0.

     *

     * Must be larger or equal to {@code minInt64Value}.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.
@@ -132,7 +140,8 @@ parcelable VehicleAreaConfig { 
     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     *

     * Only applicable for {@code FLOAT} type property. Ignored for other types.

     * Only applicable for {@code FLOAT} type property. For other types, must be

     * 0.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.
@@ -152,10 +161,13 @@ parcelable VehicleAreaConfig { 
     * boot time, both {@code minFloatValue} and {@code maxFloatValue} must be

     * set to 0.

     *

     * Note that this property only represents the minimum value at boot time

     * and may not represent the current actual minimum value.

     * Note that this property only represents the maximum value at boot time

     * and may not represent the current actual maximum value.

     *

     * Only applicable for {@code FLOAT} type property. For other types, must be

     * 0.

     *

     * Only applicable for {@code FLOAT} type property. Ignored for other types.

     * Must be larger or equal to {@code minFloatValue}.

     *

     * For certain properties, this field must be specified, see

     * {@code VehicleProperty} documentation.

automotive/vehicle/tools/generate_annotation_enums.py

+11 −11
Original line number Diff line number Diff line
@@ -51,17 +51,17 @@ ANNOTATIONS_JAVA_FILE_PATH = GENERATED_LIB + '/java/AnnotationsForVehiclePropert 
SCRIPT_PATH = 'hardware/interfaces/automotive/vehicle/tools/generate_annotation_enums.py'



TAB = '    '

RE_ENUM_START = re.compile('\s*enum VehicleProperty \{')

RE_ENUM_END = re.compile('\s*\}\;')

RE_COMMENT_BEGIN = re.compile('\s*\/\*\*?')

RE_COMMENT_END = re.compile('\s*\*\/')

RE_CHANGE_MODE = re.compile('\s*\* @change_mode (\S+)\s*')

RE_VERSION = re.compile('\s*\* @version (\S+)\s*')

RE_ACCESS = re.compile('\s*\* @access (\S+)\s*')

RE_DATA_ENUM = re.compile('\s*\* @data_enum (\S+)\s*')

RE_UNIT = re.compile('\s*\* @unit (\S+)\s+')

RE_VALUE = re.compile('\s*(\w+)\s*=(.*)')

RE_ANNOTATION = re.compile('\s*\* @(\S+)\s*')

RE_ENUM_START = re.compile(r'\s*enum VehicleProperty \{')

RE_ENUM_END = re.compile(r'\s*\}\;')

RE_COMMENT_BEGIN = re.compile(r'\s*\/\*\*?')

RE_COMMENT_END = re.compile(r'\s*\*\/')

RE_CHANGE_MODE = re.compile(r'\s*\* @change_mode (\S+)\s*')

RE_VERSION = re.compile(r'\s*\* @version (\S+)\s*')

RE_ACCESS = re.compile(r'\s*\* @access (\S+)\s*')

RE_DATA_ENUM = re.compile(r'\s*\* @data_enum (\S+)\s*')

RE_UNIT = re.compile(r'\s*\* @unit (\S+)\s+')

RE_VALUE = re.compile(r'\s*(\w+)\s*=(.*)')

RE_ANNOTATION = re.compile(r'\s*\* @(\S+)\s*')



SUPPORTED_ANNOTATIONS = ['change_mode', 'access', 'unit', 'data_enum', 'data_enum_bit_flags',

    'version', 'require_min_max_supported_value', 'require_supported_values_list',