Snap for 6553159 from ac4ee9626849c00ac58da0c3f4be59a778e61de5 to rvc-release (6fb8efd6) · Commits · e / os / android_hardware_interfaces

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -1036,6 +1036,22 @@ const ConfigDeclaration kVehicleProperties[]{
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},
		{
		.config =
		{
		.prop = toInt(VehicleProperty::CREATE_USER),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},
		{
		.config =
		{
		.prop = toInt(VehicleProperty::REMOVE_USER),
		.access = VehiclePropertyAccess::READ_WRITE,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},
		{
		.config =
		{

automotive/vehicle/2.0/default/impl/vhal_v2_0/EmulatedUserHal.cpp

+52 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ namespace impl {

		constexpr int INITIAL_USER_INFO = static_cast<int>(VehicleProperty::INITIAL_USER_INFO);
		constexpr int SWITCH_USER = static_cast<int>(VehicleProperty::SWITCH_USER);
		constexpr int CREATE_USER = static_cast<int>(VehicleProperty::CREATE_USER);
		constexpr int REMOVE_USER = static_cast<int>(VehicleProperty::REMOVE_USER);
		constexpr int USER_IDENTIFICATION_ASSOCIATION =
		static_cast<int>(VehicleProperty::USER_IDENTIFICATION_ASSOCIATION);

		@@ -37,6 +39,8 @@ bool EmulatedUserHal::isSupported(int32_t prop) {
		switch (prop) {
		case INITIAL_USER_INFO:
		case SWITCH_USER:
		case CREATE_USER:
		case REMOVE_USER:
		case USER_IDENTIFICATION_ASSOCIATION:
		return true;
		default:
		@@ -53,6 +57,11 @@ android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onSetP
		return onSetInitialUserInfoResponse(value);
		case SWITCH_USER:
		return onSetSwitchUserResponse(value);
		case CREATE_USER:
		return onSetCreateUserResponse(value);
		case REMOVE_USER:
		ALOGI("REMOVE_USER is FYI only, nothing to do...");
		return {};
		case USER_IDENTIFICATION_ASSOCIATION:
		return onSetUserIdentificationAssociation(value);
		default:
		@@ -67,6 +76,8 @@ android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onGetP
		switch (prop) {
		case INITIAL_USER_INFO:
		case SWITCH_USER:
		case CREATE_USER:
		case REMOVE_USER:
		ALOGE("onGetProperty(): %d is only supported on SET", prop);
		return android::base::Error(static_cast<int>(StatusCode::INVALID_ARG))
		<< "only supported on SET";
		@@ -162,6 +173,41 @@ android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onSetS
		return updatedValue;
		}

		android::base::Result<std::unique_ptr<VehiclePropValue>> EmulatedUserHal::onSetCreateUserResponse(
		const VehiclePropValue& value) {
		if (value.value.int32Values.size() == 0) {
		ALOGE("set(CREATE_USER): no int32values, ignoring it: %s", toString(value).c_str());
		return android::base::Error(static_cast<int>(StatusCode::INVALID_ARG))
		<< "no int32values on " << toString(value);
		}

		if (value.areaId != 0) {
		ALOGD("set(CREATE_USER) called from lshal; storing it: %s", toString(value).c_str());
		mCreateUserResponseFromCmd.reset(new VehiclePropValue(value));
		return {};
		}
		ALOGD("set(CREATE_USER) called from Android: %s", toString(value).c_str());

		int32_t requestId = value.value.int32Values[0];
		if (mCreateUserResponseFromCmd != nullptr) {
		ALOGI("replying CREATE_USER with lshal value: %s",
		toString(*mCreateUserResponseFromCmd).c_str());
		return sendUserHalResponse(std::move(mCreateUserResponseFromCmd), requestId);
		}

		// Returns default response
		auto updatedValue = std::unique_ptr<VehiclePropValue>(new VehiclePropValue);
		updatedValue->prop = CREATE_USER;
		updatedValue->timestamp = elapsedRealtimeNano();
		updatedValue->value.int32Values.resize(2);
		updatedValue->value.int32Values[0] = requestId;
		updatedValue->value.int32Values[1] = (int32_t)CreateUserStatus::SUCCESS;

		ALOGI("no lshal response; replying with SUCCESS: %s", toString(*updatedValue).c_str());

		return updatedValue;
		}

		android::base::Result<std::unique_ptr<VehiclePropValue>>
		EmulatedUserHal::onSetUserIdentificationAssociation(const VehiclePropValue& value) {
		if (value.value.int32Values.size() == 0) {
		@@ -247,6 +293,12 @@ void EmulatedUserHal::dump(int fd, std::string indent) {
		} else {
		dprintf(fd, "%sNo SwitchUser response\n", indent.c_str());
		}
		if (mCreateUserResponseFromCmd != nullptr) {
		dprintf(fd, "%sCreateUser response: %s\n", indent.c_str(),
		toString(*mCreateUserResponseFromCmd).c_str());
		} else {
		dprintf(fd, "%sNo CreateUser response\n", indent.c_str());
		}
		if (mSetUserIdentificationAssociationResponseFromCmd != nullptr) {
		dprintf(fd, "%sSetUserIdentificationAssociation response: %s\n", indent.c_str(),
		toString(*mSetUserIdentificationAssociationResponseFromCmd).c_str());

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,12 @@ class EmulatedUserHal {
		android::base::Result<std::unique_ptr<VehiclePropValue>> onSetSwitchUserResponse(
		const VehiclePropValue& value);

		/**
		* Used to emulate CREATE_USER - see onSetInitialUserInfoResponse() for usage.
		*/
		android::base::Result<std::unique_ptr<VehiclePropValue>> onSetCreateUserResponse(
		const VehiclePropValue& value);

		/**
		* Used to emulate USER_IDENTIFICATION_ASSOCIATION - see onSetInitialUserInfoResponse() for
		* usage.
		@@ -116,6 +122,7 @@ class EmulatedUserHal {

		std::unique_ptr<VehiclePropValue> mInitialUserResponseFromCmd;
		std::unique_ptr<VehiclePropValue> mSwitchUserResponseFromCmd;
		std::unique_ptr<VehiclePropValue> mCreateUserResponseFromCmd;
		std::unique_ptr<VehiclePropValue> mSetUserIdentificationAssociationResponseFromCmd;
		};

bluetooth/1.0/vts/functional/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,4 +26,5 @@ cc_test {
		"general-tests",
		"vts",
		],
		disable_framework: true,
		}

graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp

+8 −5

Original line number	Diff line number	Diff line
		@@ -414,12 +414,9 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi

		mWriter->validateDisplay();
		execute();
		if (mReader->mCompositionChanges.size() != 0) {
		GTEST_SUCCEED() << "Composition change requested, skipping test";
		return;
		}

		ASSERT_EQ(0, mReader->mErrors.size());
		mReader->mCompositionChanges.clear();

		mWriter->presentDisplay();
		execute();
		ASSERT_EQ(0, mReader->mErrors.size());
		@@ -427,8 +424,14 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi
		mWriter->selectLayer(layer);
		auto handle2 = allocate();
		ASSERT_NE(nullptr, handle2);

		mWriter->setLayerBuffer(0, handle2, -1);
		mWriter->setLayerSurfaceDamage(std::vector<IComposerClient::Rect>(1, {0, 0, 10, 10}));
		mWriter->validateDisplay();
		execute();
		ASSERT_EQ(0, mReader->mErrors.size());
		mReader->mCompositionChanges.clear();

		mWriter->presentDisplay();
		execute();
		}