Snap for 4739962 from a088ab45707ce6f368f8171a3512197b1b06fbed to pi-release (bc904e30) · Commits · e / os / android_hardware_interfaces

audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,8 @@ struct EffectsFactory : public IEffectsFactory {
		Return<void> getDescriptor(const Uuid& uid, getDescriptor_cb _hidl_cb) override;
		Return<void> createEffect(const Uuid& uid, int32_t session, int32_t ioHandle,
		createEffect_cb _hidl_cb) override;
		Return<void> debugDump(const hidl_handle& fd);
		Return<void> debugDump(const hidl_handle& fd); //< in V2_0::IEffectsFactory only, alias of debug
		Return<void> debug(const hidl_handle& fd, const hidl_vec<hidl_string>& options) override;

		private:
		static sp<IEffect> dispatchEffectInstanceCreation(const effect_descriptor_t& halDescriptor,

audio/effect/all-versions/default/include/effect/all-versions/default/EffectsFactory.impl.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,11 @@ Return<void> EffectsFactory::createEffect(const Uuid& uid, int32_t session, int3
		}

		Return<void> EffectsFactory::debugDump(const hidl_handle& fd) {
		return debug(fd, {} /* options */);
		}

		Return<void> EffectsFactory::debug(const hidl_handle& fd,
		const hidl_vec<hidl_string>& /* options */) {
		if (fd.getNativeHandle() != nullptr && fd->numFds == 1) {
		EffectDumpEffects(fd->data[0]);
		}

compatibility_matrices/compatibility_matrix.3.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -266,7 +266,7 @@
		</hal>
		<hal format="hidl" optional="true">
		<name>android.hardware.nfc</name>
		<version>1.0-1</version>
		<version>1.1</version>
		<interface>
		<name>INfc</name>
		<instance>default</instance>

dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@ service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-servi
		class hal
		user system
		group system
		interface android.hardware.dumpstate@1.0::IDumpstateDevice default

neuralnetworks/1.1/vts/functional/Models.h

+323 −269

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(avg_pool_float_4) \
		FN(avg_pool_float_4_relaxed) \
		FN(avg_pool_float_5) \
		FN(avg_pool_float_5_relaxed) \
		FN(avg_pool_quant8_1) \
		FN(avg_pool_quant8_2) \
		FN(avg_pool_quant8_3) \
		@@ -54,7 +55,9 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(avg_pool_quant8_5) \
		FN(batch_to_space) \
		FN(batch_to_space_float_1) \
		FN(batch_to_space_float_1_relaxed) \
		FN(batch_to_space_quant8_1) \
		FN(batch_to_space_relaxed) \
		FN(concat_float_1) \
		FN(concat_float_1_relaxed) \
		FN(concat_float_2) \
		@@ -74,6 +77,7 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(conv_3_h3_w2_VALID_relaxed) \
		FN(conv_float) \
		FN(conv_float_2) \
		FN(conv_float_2_relaxed) \
		FN(conv_float_channels) \
		FN(conv_float_channels_relaxed) \
		FN(conv_float_channels_weights_as_inputs) \
		@@ -105,13 +109,18 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(depthwise_conv) \
		FN(depthwise_conv2d_float) \
		FN(depthwise_conv2d_float_2) \
		FN(depthwise_conv2d_float_2_relaxed) \
		FN(depthwise_conv2d_float_large) \
		FN(depthwise_conv2d_float_large_2) \
		FN(depthwise_conv2d_float_large_2_relaxed) \
		FN(depthwise_conv2d_float_large_2_weights_as_inputs) \
		FN(depthwise_conv2d_float_large_2_weights_as_inputs_relaxed) \
		FN(depthwise_conv2d_float_large_relaxed) \
		FN(depthwise_conv2d_float_large_weights_as_inputs) \
		FN(depthwise_conv2d_float_large_weights_as_inputs_relaxed) \
		FN(depthwise_conv2d_float_relaxed) \
		FN(depthwise_conv2d_float_weights_as_inputs) \
		FN(depthwise_conv2d_float_weights_as_inputs_relaxed) \
		FN(depthwise_conv2d_quant8) \
		FN(depthwise_conv2d_quant8_2) \
		FN(depthwise_conv2d_quant8_large) \
		@@ -119,15 +128,24 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(depthwise_conv2d_quant8_weights_as_inputs) \
		FN(depthwise_conv_relaxed) \
		FN(dequantize) \
		FN(dequantize_relaxed) \
		FN(div) \
		FN(div_broadcast_float) \
		FN(div_broadcast_float_relaxed) \
		FN(div_relaxed) \
		FN(embedding_lookup) \
		FN(embedding_lookup_relaxed) \
		FN(floor) \
		FN(floor_relaxed) \
		FN(fully_connected_float) \
		FN(fully_connected_float_2) \
		FN(fully_connected_float_2_relaxed) \
		FN(fully_connected_float_4d_simple) \
		FN(fully_connected_float_4d_simple_relaxed) \
		FN(fully_connected_float_large) \
		FN(fully_connected_float_large_relaxed) \
		FN(fully_connected_float_large_weights_as_inputs) \
		FN(fully_connected_float_large_weights_as_inputs_relaxed) \
		FN(fully_connected_float_relaxed) \
		FN(fully_connected_float_weights_as_inputs) \
		FN(fully_connected_float_weights_as_inputs_relaxed) \
		@@ -141,12 +159,15 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(hashtable_lookup_quant8) \
		FN(l2_normalization) \
		FN(l2_normalization_2) \
		FN(l2_normalization_2_relaxed) \
		FN(l2_normalization_large) \
		FN(l2_normalization_large_relaxed) \
		FN(l2_normalization_relaxed) \
		FN(l2_pool_float) \
		FN(l2_pool_float_2) \
		FN(l2_pool_float_2_relaxed) \
		FN(l2_pool_float_large) \
		FN(l2_pool_float_large_relaxed) \
		FN(l2_pool_float_relaxed) \
		FN(local_response_norm_float_1) \
		FN(local_response_norm_float_1_relaxed) \
		@@ -195,15 +216,19 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(max_pool_float_3) \
		FN(max_pool_float_3_relaxed) \
		FN(max_pool_float_4) \
		FN(max_pool_float_4_relaxed) \
		FN(max_pool_quant8_1) \
		FN(max_pool_quant8_2) \
		FN(max_pool_quant8_3) \
		FN(max_pool_quant8_4) \
		FN(mean) \
		FN(mean_float_1) \
		FN(mean_float_1_relaxed) \
		FN(mean_float_2) \
		FN(mean_float_2_relaxed) \
		FN(mean_quant8_1) \
		FN(mean_quant8_2) \
		FN(mean_relaxed) \
		FN(mobilenet_224_gender_basic_fixed) \
		FN(mobilenet_224_gender_basic_fixed_relaxed) \
		FN(mobilenet_quantized) \
		@@ -215,6 +240,8 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(mul_relu_relaxed) \
		FN(pad) \
		FN(pad_float_1) \
		FN(pad_float_1_relaxed) \
		FN(pad_relaxed) \
		FN(relu1_float_1) \
		FN(relu1_float_1_relaxed) \
		FN(relu1_float_2) \
		@@ -230,6 +257,7 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(relu_float_1) \
		FN(relu_float_1_relaxed) \
		FN(relu_float_2) \
		FN(relu_float_2_relaxed) \
		FN(relu_quant8_1) \
		FN(relu_quant8_2) \
		FN(reshape) \
		@@ -240,6 +268,7 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(reshape_weights_as_inputs_relaxed) \
		FN(resize_bilinear) \
		FN(resize_bilinear_2) \
		FN(resize_bilinear_2_relaxed) \
		FN(resize_bilinear_relaxed) \
		FN(rnn) \
		FN(rnn_relaxed) \
		@@ -253,11 +282,15 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(softmax_quant8_2) \
		FN(space_to_batch) \
		FN(space_to_batch_float_1) \
		FN(space_to_batch_float_1_relaxed) \
		FN(space_to_batch_float_2) \
		FN(space_to_batch_float_2_relaxed) \
		FN(space_to_batch_float_3) \
		FN(space_to_batch_float_3_relaxed) \
		FN(space_to_batch_quant8_1) \
		FN(space_to_batch_quant8_2) \
		FN(space_to_batch_quant8_3) \
		FN(space_to_batch_relaxed) \
		FN(space_to_depth_float_1) \
		FN(space_to_depth_float_1_relaxed) \
		FN(space_to_depth_float_2) \
		@@ -268,19 +301,34 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(space_to_depth_quant8_2) \
		FN(squeeze) \
		FN(squeeze_float_1) \
		FN(squeeze_float_1_relaxed) \
		FN(squeeze_quant8_1) \
		FN(squeeze_relaxed) \
		FN(strided_slice) \
		FN(strided_slice_float_1) \
		FN(strided_slice_float_10) \
		FN(strided_slice_float_10_relaxed) \
		FN(strided_slice_float_11) \
		FN(strided_slice_float_11_relaxed) \
		FN(strided_slice_float_1_relaxed) \
		FN(strided_slice_float_2) \
		FN(strided_slice_float_2_relaxed) \
		FN(strided_slice_float_3) \
		FN(strided_slice_float_3_relaxed) \
		FN(strided_slice_float_4) \
		FN(strided_slice_float_4_relaxed) \
		FN(strided_slice_float_5) \
		FN(strided_slice_float_5_relaxed) \
		FN(strided_slice_float_6) \
		FN(strided_slice_float_6_relaxed) \
		FN(strided_slice_float_7) \
		FN(strided_slice_float_7_relaxed) \
		FN(strided_slice_float_8) \
		FN(strided_slice_float_8_relaxed) \
		FN(strided_slice_float_9) \
		FN(strided_slice_float_9_relaxed) \
		FN(strided_slice_qaunt8_10) \
		FN(strided_slice_qaunt8_11) \
		FN(strided_slice_quant8_1) \
		FN(strided_slice_quant8_2) \
		FN(strided_slice_quant8_3) \
		@@ -290,7 +338,11 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(strided_slice_quant8_7) \
		FN(strided_slice_quant8_8) \
		FN(strided_slice_quant8_9) \
		FN(strided_slice_relaxed) \
		FN(sub) \
		FN(sub_broadcast_float) \
		FN(sub_broadcast_float_relaxed) \
		FN(sub_relaxed) \
		FN(svdf) \
		FN(svdf2) \
		FN(svdf2_relaxed) \
		@@ -301,7 +353,9 @@ using MixedTypedExample = generated_tests::MixedTypedExampleType;
		FN(tanh_relaxed) \
		FN(transpose) \
		FN(transpose_float_1) \
		FN(transpose_quant8_1)
		FN(transpose_float_1_relaxed) \
		FN(transpose_quant8_1) \
		FN(transpose_relaxed)

		#define FORWARD_DECLARE_GENERATED_OBJECTS(function) \
		namespace function { \