release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release-41... (e6aae839) · Commits · e / os / android_hardware_interfaces

automotive/evs/1.0/vts/functional/VtsEvsV1_0TargetTest.cpp

+8 −3

Original line number	Diff line number	Diff line
		@@ -17,8 +17,13 @@
		#define LOG_TAG "VtsHalEvsTest"


		// TODO: How should we configure these values to target appropriate hardware?
		const static char kEnumeratorName[] = "EvsEnumeratorHw-Mock";
		// Note: We have't got a great way to indicate which target
		// should be tested, so we'll leave the interface served by the
		// default (mock) EVS driver here for easy reference. All
		// actual EVS drivers should serve on the EvsEnumeratorHw name,
		// however, so the code is checked in that way.
		//const static char kEnumeratorName[] = "EvsEnumeratorHw-Mock";
		const static char kEnumeratorName[] = "EvsEnumeratorHw";


		// These values are called out in the EVS design doc (as of Mar 8, 2017)

automotive/vehicle/2.1/types.hal

+36 −20

Original line number	Diff line number	Diff line
		@@ -44,6 +44,42 @@ enum VehicleProperty: @2.0::VehicleProperty {
		\| VehiclePropertyType:FLOAT_VEC
		\| VehicleArea:GLOBAL),

		/**
		* Automatic re-circulation on/off
		*
		* IVehicle#set may return StatusCode::NOT_AVAILABLE and IVehicle#get is not
		* guaranteed to work if HVAC unit is off. See HVAC_POWER_ON property for
		* details.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		*/
		HVAC_AUTO_RECIRC_ON = (
		0x0512
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:BOOLEAN
		\| VehicleArea:ZONE),

		/**
		* Vehicle Maps Service (VMS) message
		*
		* This property uses COMPLEX data to communicate vms messages.
		*
		* Its contents are to be interpreted as follows:
		* the indices defined in VmsMessageIntegerValuesIndex are to be used to
		* read from int32Values;
		* bytes is a serialized VMS message as defined in the vms protocol
		* which is opaque to the framework;
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		*/
		VEHICLE_MAP_SERVICE = (
		0x0C00
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:COMPLEX
		\| VehicleArea:GLOBAL),

		/**
		* OBD2 Live Sensor Data
		*
		@@ -174,26 +210,6 @@ enum VehicleProperty: @2.0::VehicleProperty {
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:COMPLEX
		\| VehicleArea:GLOBAL),

		/**
		* Vehicle Maps Service (VMS) message
		*
		* This property uses COMPLEX data to communicate vms messages.
		*
		* Its contents are to be interpreted as follows:
		* the indices defined in VmsMessageIntegerValuesIndex are to be used to
		* read from int32Values;
		* bytes is a serialized VMS message as defined in the vms protocol
		* which is opaque to the framework;
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		*/
		VEHICLE_MAP_SERVICE = (
		0x0C00
		\| VehiclePropertyGroup:SYSTEM
		\| VehiclePropertyType:COMPLEX
		\| VehicleArea:GLOBAL),
		};

		/** The status of a fuel system as described by the OBD2 specification. */

broadcastradio/1.0/types.hal

+4 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,10 @@ struct MetaData {
		struct ProgramInfo {
		uint32_t channel; /** current channel. (e.g kHz for band type AM_FM) */
		uint32_t subChannel; /** current sub channel. (FM_HD) */
		bool tuned; /** tuned to a program or not */

		/** Tuned to a program (not a noise). It's the same condition that would stop scan operation. */
		bool tuned;

		bool stereo; /** program is stereo or not */
		bool digital; /** digital program or not (e.g HD Radio program) */
		uint32_t signalStrength; /** signal strength from 0 to 100 */

broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -599,11 +599,8 @@ TEST_P(BroadcastRadioHidlTest, TuneAndGetProgramInformationAndCancel) {
		EXPECT_TRUE(hidlReturn.isOk());
		EXPECT_EQ(Result::OK, halResult);
		if (mResultCallbackData == Result::OK) {
		EXPECT_EQ(true, halInfo.tuned);
		EXPECT_LE(halInfo.channel, upperLimit);
		EXPECT_GE(halInfo.channel, lowerLimit);
		} else {
		EXPECT_EQ(false, halInfo.tuned);
		}

		// test cancel

broadcastradio/1.1/default/Android.bp

+5 −3

Original line number	Diff line number	Diff line
		@@ -27,16 +27,18 @@ cc_library_shared {
		"BroadcastRadio.cpp",
		"BroadcastRadioFactory.cpp",
		"Tuner.cpp",
		"Utils.cpp",
		"VirtualProgram.cpp",
		"VirtualRadio.cpp",
		],
		static_libs: [
		"android.hardware.broadcastradio@1.1-utils-lib",
		],
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libutils",
		"liblog",
		"libhardware",
		"android.hardware.broadcastradio@1.0",
		"android.hardware.broadcastradio@1.1",
		"libradio_metadata",
		],
		}