Merge "Merge Android 12 QPR1" (b16c246d) · Commits · e / os / android_hardware_interfaces

automotive/evs/OWNERS

+2 −0

Original line number	Diff line number	Diff line
		changyeon@google.com
		garysungang@google.com
		haoxiangl@google.com

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1025,7 +1025,7 @@ const ConfigDeclaration kVehicleProperties[]{
		.config =
		{
		.prop = toInt(VehicleProperty::EPOCH_TIME),
		.access = VehiclePropertyAccess::READ_WRITE,
		.access = VehiclePropertyAccess::WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},

automotive/vehicle/2.0/types.hal

+25 −10

Original line number	Diff line number	Diff line
		@@ -487,8 +487,11 @@ enum VehicleProperty : int32_t {
		* int64Values[3] = rear right ticks
		* int64Values[4] = rear left ticks
		*
		* configArray is used to indicate the micrometers-per-wheel-tick value and
		* which wheels are supported. configArray is set as follows:
		* configArray is used to indicate the micrometers-per-wheel-tick values and
		* which wheels are supported. Each micrometers-per-wheel-tick value is static (i.e. will not
		* update based on wheel's status) and a best approximation. For example, if a vehicle has
		* multiple rim/tire size options, the micrometers-per-wheel-tick values are set to those for
		* the typically expected rim/tire size. configArray is set as follows:
		*
		* configArray[0], bits [0:3] = supported wheels. Uses enum Wheel.
		* configArray[1] = micrometers per front left wheel tick
		@@ -1433,17 +1436,29 @@ enum VehicleProperty : int32_t {
		* This value denotes the number of milliseconds seconds that have
		* elapsed since 1/1/1970 UTC.
		*
		* Reading this value will give you the system’s time. This can be
		* useful to synchronize other vehicle systems (dash clock etc).
		* AAOS will write to this value to give VHAL the Android system's time,
		* if the VHAL supports this property. This can be useful to synchronize
		* other vehicle systems (dash clock etc) with Android's time.
		*
		* Writing this value will update the ‘ExternalTimeSuggestion’
		* value (if enabled). This value may be consumed by the “Time
		* Detector Service”, if other sources do not have a higher
		* priority. For information on how to adjust time source
		* priorities see Time Detector Service documentation.
		* AAOS writes to this property once during boot, and
		* will thereafter write only when some time-source changes are propagated.
		* AAOS will fill in VehiclePropValue.timestamp correctly.
		* Note that AAOS will not send updates for natural elapse of time.
		* int64Values[0] = provided Unix time (in milliseconds)
		*
		* Note that the property may take >0 ms to get propagated through the stack
		* and, having a timestamped property helps reduce any time drift. So,
		* for all writes to the property, the timestamp can be used to negate this
		* drift:
		* drift = currentTimeMillis - PropValue.timestamp
		* effectiveTime = PropValue.value.int64Values[0] + diff
		*
		* Aside, this property could have been better named ANDROID_EPOCH_TIME, but it
		* continues to be called EPOCH_TIME for legacy reasons. We will try to fix
		* this naming discrepancy when we migrate to AIDL.
		*
		* @change_mode VehiclePropertyChangeMode:ON_CHANGE
		* @access VehiclePropertyAccess:READ_WRITE
		* @access VehiclePropertyAccess:WRITE_ONLY
		* @unit VehicleUnit:MILLI_SECS
		*/
		EPOCH_TIME = (

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -3837,6 +3837,8 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) {
		getAvailableOutputStreams(staticMeta, outputStreams,
		&outputThreshold));
		for (auto& outputIter : outputStreams) {
		V3_2::DataspaceFlags outputDataSpace =
		getDataspace(static_cast<PixelFormat>(outputIter.format));
		V3_2::Stream zslStream = {streamId++,
		StreamType::OUTPUT,
		static_cast<uint32_t>(input.width),
		@@ -3859,7 +3861,7 @@ TEST_P(CameraHidlTest, configureStreamsZSLInputOutputs) {
		static_cast<uint32_t>(outputIter.height),
		static_cast<PixelFormat>(outputIter.format),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER,
		0,
		outputDataSpace,
		StreamRotation::ROTATION_0};

		::android::hardware::hidl_vec<V3_2::Stream> streams = {inputStream, zslStream,

current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -898,6 +898,8 @@ ea465970e96d9605ee6f6706b3b512726c66d2644738added9128c739f8f8b0c android.hardwar
		c8a57364f6ad20842be14f4db284df5304f7521ca8eac6bcc1fa6c5b466fb8a6 android.hardware.wifi.supplicant@1.4::ISupplicantStaNetwork
		2123482b69f3b531c88023aa2a007110e130efbf4ed68ac9ce0bc55d5e82bc8b android.hardware.wifi.supplicant@1.4::ISupplicantStaNetworkCallback
		0821f516e4d428bc15251969f7e19411c94d8f2ccbd99e1fc8168d8e49e38b0f android.hardware.wifi.supplicant@1.4::types
		4a087a308608d146b022ebc15633de989f5f4dfe1491a83fa41763290a82e40d android.hardware.automotive.vehicle@2.0::types
		70eb14415391f835fb218b43a1e25f5d6495f098f96fa2acaea70985e98e1ce8 android.hardware.automotive.vehicle@2.0::types

		# ABI preserving changes to HALs during Android T
		62ace52d9c3ff1f60f94118557a2aaf0b953513e59dcd34d5f94ae28d4c7e780 android.hardware.fastboot@1.0::IFastboot