Snap for 7336869 from bec76e8c9ea6177f7716a7709eff084e43a9208c to sc-d1-release (d43fdd20) · Commits · e / os / android_hardware_interfaces

audio/core/all-versions/default/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ cc_defaults {
		"android.hardware.audio-impl_headers",
		"android.hardware.audio.common.util@all-versions",
		"libaudioclient_headers",
		"libaudioutils_headers",
		"libaudio_system_headers",
		"libhardware_headers",
		"libmedia_headers",

+6 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@

		#include <HidlUtils.h>
		#include <android/log.h>
		#include <audio_utils/Metadata.h>
		#include <hardware/audio.h>
		#include <util/CoreUtils.h>
		#include <utils/Trace.h>
		@@ -742,7 +743,11 @@ int StreamOut::asyncEventCallback(stream_event_callback_type_t event, void* para
		switch (event) {
		case STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED: {
		hidl_vec<uint8_t> audioMetadata;
		audioMetadata.setToExternal((uint8_t)param, strlen((char)param));
		// void* param is the byte string buffer from byte_string_from_audio_metadata().
		// As the byte string buffer may have embedded zeroes, we cannot use strlen()
		// but instead use audio_utils::metadata::dataByteStringLen().
		audioMetadata.setToExternal((uint8_t*)param, audio_utils::metadata::dataByteStringLen(
		(const uint8_t*)param));
		result = eventCallback->onCodecFormatChanged(audioMetadata);
		} break;
		default:

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,9 +14,14 @@ cc_test {
		"use_libaidlvintf_gtest_helper_static",
		],
		srcs: ["VtsHalBiometricsFaceTargetTest.cpp"],
		static_libs: [
		"android.hardware.biometrics.common-V1-ndk_platform",
		"android.hardware.biometrics.face-V1-ndk_platform",
		"android.hardware.common-V2-ndk_platform",
		"android.hardware.keymaster-V3-ndk_platform",
		],
		shared_libs: [
		"libbinder_ndk",
		"android.hardware.biometrics.face-V1-ndk_platform",
		],
		test_suites: [
		"general-tests",

+2 −0

Original line number	Diff line number	Diff line
		@@ -306,6 +306,8 @@ TEST_P(GatekeeperHidlTest, UntrustedReenroll) {
		if (first != nullptr && second != nullptr) {
		EXPECT_NE(first->user_id, second->user_id);
		}
		// the old enrollment should be invalid now
		verifyPassword(password, enrollRsp.data, 0, verifyRsp, false);
		ALOGI("Testing Untrusted Reenroll done");
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -275,8 +275,7 @@ interface IKeyMintDevice {
		*
		* o Tag::RSA_PUBLIC_EXPONENT specifies the RSA public exponent value. If omitted, generateKey
		* must return ErrorCode::INVALID_ARGUMENT. The values 3 and 65537 must be supported. It is
		* recommended to support all prime values up to 2^64. If provided with a non-prime value,
		* generateKey must return ErrorCode::INVALID_ARGUMENT.
		* recommended to support all prime values up to 2^64.
		*
		* The following parameters are not necessary to generate a usable RSA key, but generateKey must
		* not return an error if they are omitted: