Snap for 4796401 from 3fea05cd400172194adfb5fe8fe5c0e25ca292ab to pi-release (b9b5b354) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ hidl_interface {
		"VehicleAreaDoor",
		"VehicleAreaMirror",
		"VehicleAreaSeat",
		"VehicleAreaWheel",
		"VehicleAreaWindow",
		"VehicleDisplay",
		"VehicleGear",
		@@ -68,7 +69,6 @@ hidl_interface {
		"VmsOfferingMessageIntegerValuesIndex",
		"VmsPublisherInformationIntegerValuesIndex",
		"VmsSubscriptionsStateIntegerValuesIndex",
		"Wheel",
		],
		gen_java: true,
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,8 @@ constexpr int TRACTION_CONTROL_ACTIVE = (int)VehicleProperty::TRACTION_CONTROL_A
		constexpr int VEHICLE_MAP_SERVICE = (int)VehicleProperty::VEHICLE_MAP_SERVICE;
		constexpr int WHEEL_TICK = (int)VehicleProperty::WHEEL_TICK;
		constexpr int ALL_WHEELS =
		(int)(Wheel::LEFT_FRONT \| Wheel::RIGHT_FRONT \| Wheel::LEFT_REAR \| Wheel::RIGHT_REAR);
		(int)(VehicleAreaWheel::LEFT_FRONT \| VehicleAreaWheel::RIGHT_FRONT \|
		VehicleAreaWheel::LEFT_REAR \| VehicleAreaWheel::RIGHT_REAR);
		constexpr int HVAC_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT \| VehicleAreaSeat::ROW_2_LEFT \|
		VehicleAreaSeat::ROW_2_CENTER);
		constexpr int HVAC_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT \| VehicleAreaSeat::ROW_2_RIGHT);
		@@ -484,8 +485,7 @@ const ConfigDeclaration kVehicleProperties[]{

		{.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),
		.access = VehiclePropertyAccess::WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		.configArray = {3}},
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE},
		.initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}},

		{.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),

+4 −12

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ enum VehicleArea : int32_t {
		SEAT = 0x05000000,
		/** DOOR maps to enum VehicleAreaDoor */
		DOOR = 0x06000000,
		/** WHEEL maps to enum Wheel */
		/** WHEEL maps to enum VehicleAreaWheel */
		WHEEL = 0x07000000,

		MASK = 0x0f000000,
		@@ -1090,8 +1090,8 @@ enum VehicleProperty : int32_t {
		* It is assumed that AP's power state is controller by separate power
		* controller.
		*
		* For configuration information, VehiclePropConfig.configFlags can
		* have bit flag combining values in VehicleApPowerStateConfigFlag.
		* For configuration information, VehiclePropConfig.configArray can have bit flag combining
		* values in VehicleApPowerStateConfigFlag.
		*
		* int32Values[0] : VehicleApPowerStateReq enum value
		* int32Values[1] : additional parameter relevant for each state,
		@@ -2582,14 +2582,6 @@ struct VehiclePropConfig {
		*/
		vec<VehicleAreaConfig> areaConfigs;

		/**
		* Configuration flags for this property.
		*
		* For example, it may store the number of presets that are stored by the
		* radio module.
		*/
		int32_t configFlags;

		/** Contains additional configuration parameters */
		vec<int32_t> configArray;

		@@ -2754,7 +2746,7 @@ enum StatusCode : int32_t {
		INTERNAL_ERROR = 5,
		};

		enum Wheel : int32_t {
		enum VehicleAreaWheel : int32_t {
		UNKNOWN = 0x0,

		LEFT_FRONT = 0x1,

+1 −1

Original line number	Diff line number	Diff line
		@@ -311,7 +311,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar
		3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types
		b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle
		7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback
		44c8b452186b65f5140a224721f238b76ed3adc42460f26b801b561593744c7e android.hardware.automotive.vehicle@2.0::types
		3562503f550f70eec7a688343a600fb92b74efb807a31452b70195dfab328b22 android.hardware.automotive.vehicle@2.0::types
		32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost
		ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload
		27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types

+3 −3

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ limitations under the License.

		# Wi-Fi Aware (NAN) HAL API Usage

		The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/\<version\>/</i>):
		The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/1.0/</i>):

		* IWifiNanIface.hal
		* IWifiNanIfaceEventCallback.hal
		@@ -23,7 +23,7 @@ The Wi-Fi Aware (NAN) HAL API is defined in (<i>hardware/interfaces/wifi/\<versi
		The Wi-Fi Aware (NAN) HAL API surface is very large - only a subset is used from the framework.

		Understanding of the HAL API subset which is actively used by the Android framework can be deduced
		by reviewing framework code, specifically (<i>frameworks/opt/net/wif/</i>):
		by reviewing framework code, specifically (<i>frameworks/opt/net/wifi/</i>):

		* WifiAwareNativeApi.java
		* WifiAwareNativeCallback.java
		@@ -41,7 +41,7 @@ the new HAL API only. To understand the mapping between new and legacy HALs plea

		Format:
		* Hard-coded values are in <b>bold</b>, e.g. <b>true</b> or <b>5</b>
		* Assigned but not fixed value are specified using the <i>variable</i> keyword, possibly with some
		* Assigned but not fixed values are specified using the <i>variable</i> keyword, possibly with some
		details/constraints
		* Unassigned values are specified using the <i>N/A</i> keyword. Unassigned usually means initialized
		to 0.