Snap for 8124529 from 1aab61da7bc00e259e20ef4d7b39dbcc9d816a86 to tm-d1-release (5c17511f) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleProperty.aidl

+4 −0

Original line number	Diff line number	Diff line
		@@ -194,4 +194,8 @@ enum VehicleProperty {
		CLUSTER_NAVIGATION_STATE = 292556600,
		ELECTRONIC_TOLL_COLLECTION_CARD_TYPE = 289410873,
		ELECTRONIC_TOLL_COLLECTION_CARD_STATUS = 289410874,
		FRONT_FOG_LIGHTS_STATE = 289410875,
		FRONT_FOG_LIGHTS_SWITCH = 289410876,
		REAR_FOG_LIGHTS_STATE = 289410877,
		REAR_FOG_LIGHTS_SWITCH = 289410878,
		}

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

+87 −0

Original line number	Diff line number	Diff line
		@@ -1888,6 +1888,22 @@ enum VehicleProperty {
		*
		* Return the current state of fog lights.
		*
		* If the car has both front and rear fog lights:
		* If front and rear fog lights can only be controlled together: FOG_LIGHTS_STATE must be
		* implemented. FRONT_FOG_LIGHTS_STATE and REAR_FOG_LIGHTS_STATE must not be implemented.
		*
		* If the front and rear fog lights can only be controlled independently: FOG_LIGHTS_STATE
		* must not be implemented. FRONT_FOG_LIGHTS_STATE and REAR_FOG_LIGHTS_STATE must be
		* implemented.
		*
		* If the car has only front fog lights:
		* Only one of FOG_LIGHTS_STATE or FRONT_FOG_LIGHTS_STATE must be implemented and not both.
		* REAR_FOG_LIGHTS_STATE must not be implemented.
		*
		* If the car has only rear fog lights:
		* Only one of FOG_LIGHTS_STATE or REAR_FOG_LIGHTS_STATE must be implemented and not both.
		* FRONT_FOG_LIGHTS_STATE must not be implemented.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ
		* @data_enum VehicleLightState
		@@ -1932,6 +1948,22 @@ enum VehicleProperty {
		*
		* The setting that the user wants.
		*
		* If the car has both front and rear fog lights:
		* If front and rear fog lights can only be controlled together: FOG_LIGHTS_SWITCH must be
		* implemented. FRONT_FOG_LIGHTS_SWITCH and REAR_FOG_LIGHTS_SWITCH must not be implemented.
		*
		* If the front and rear fog lights can only be controlled independently: FOG_LIGHTS_SWITCH
		* must not be implemented. FRONT_FOG_LIGHTS_SWITCH and REAR_FOG_LIGHTS_SWITCH must be
		* implemented.
		*
		* If the car has only front fog lights:
		* Only one of FOG_LIGHTS_SWITCH or FRONT_FOG_LIGHTS_SWITCH must be implemented and not both.
		* REAR_FOG_LIGHTS_SWITCH must not be implemented.
		*
		* If the car has only rear fog lights:
		* Only one of FOG_LIGHTS_SWITCH or REAR_FOG_LIGHTS_SWITCH must be implemented and not both.
		* FRONT_FOG_LIGHTS_SWITCH must not be implemented.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleLightSwitch
		@@ -2637,4 +2669,59 @@ enum VehicleProperty {
		*/
		ELECTRONIC_TOLL_COLLECTION_CARD_STATUS = 0x0F3A + 0x10000000 + 0x01000000
		+ 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32
		/**
		* Front fog lights state
		*
		* Return the current state of the front fog lights.
		* Only one of FOG_LIGHTS_STATE or FRONT_FOG_LIGHTS_STATE must be implemented. Please refer to
		* the documentation on FOG_LIGHTS_STATE for more information.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ
		* @data_enum VehicleLightState
		*/
		FRONT_FOG_LIGHTS_STATE = 0x0F3B + 0x10000000 + 0x01000000
		+ 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32

		/**
		* Front fog lights switch
		*
		* The setting that the user wants.
		* Only one of FOG_LIGHTS_SWITCH or FRONT_FOG_LIGHTS_SWITCH must be implemented. Please refer to
		* the documentation on FOG_LIGHTS_SWITCH for more information.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleLightSwitch
		*/
		FRONT_FOG_LIGHTS_SWITCH = 0x0F3C + 0x10000000 + 0x01000000
		+ 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32

		/**
		* Rear fog lights state
		*
		* Return the current state of the rear fog lights.
		* Only one of FOG_LIGHTS_STATE or REAR_FOG_LIGHTS_STATE must be implemented. Please refer to
		* the documentation on FOG_LIGHTS_STATE for more information.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ
		* @data_enum VehicleLightState
		*/
		REAR_FOG_LIGHTS_STATE = 0x0F3D + 0x10000000 + 0x01000000
		+ 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32

		/**
		* Rear fog lights switch
		*
		* The setting that the user wants.
		* Only one of FOG_LIGHTS_SWITCH or REAR_FOG_LIGHTS_SWITCH must be implemented. Please refer to
		* the documentation on FOG_LIGHTS_SWITCH for more information.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @data_enum VehicleLightSwitch
		*/
		REAR_FOG_LIGHTS_SWITCH = 0x0F3E + 0x10000000 + 0x01000000
		+ 0x00400000, // VehiclePropertyGroup:SYSTEM,VehicleArea:GLOBAL,VehiclePropertyType:INT32
		}

automotive/vehicle/aidl/impl/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ package {
		cc_defaults {
		name: "VehicleHalDefaults",
		static_libs: [
		"android-automotive-large-parcelable-vendor-lib",
		"android.hardware.automotive.vehicle-V1-ndk",
		"libmath",
		],
		@@ -35,4 +36,7 @@ cc_defaults {
		"-Werror",
		"-Wthread-safety",
		],
		defaults: [
		"android-automotive-large-parcelable-defaults",
		],
		}

automotive/vehicle/aidl/impl/vhal/include/ParcelableUtils.h→automotive/vehicle/aidl/impl/utils/common/include/ParcelableUtils.h

+0 −0

File moved.

View file

automotive/vehicle/aidl/impl/vhal/include/PendingRequestPool.h→automotive/vehicle/aidl/impl/utils/common/include/PendingRequestPool.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ class PendingRequestPool final {
		public:
		using TimeoutCallbackFunc = std::function<void(const std::unordered_set<int64_t>&)>;

		explicit PendingRequestPool(int64_t timeoutInSec);
		explicit PendingRequestPool(int64_t timeoutInNano);

		~PendingRequestPool();