Snap for 4824048 from 308d390720d0627de06a82e590b9e0359fea2b0a to pi-release (eab0364c) · Commits · e / os / android_hardware_interfaces

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

+15 −21

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ namespace impl {
		constexpr int ABS_ACTIVE = (int)VehicleProperty::ABS_ACTIVE;
		constexpr int AP_POWER_STATE_REQ = (int)VehicleProperty::AP_POWER_STATE_REQ;
		constexpr int AP_POWER_STATE_REPORT = (int)VehicleProperty::AP_POWER_STATE_REPORT;
		constexpr int DOOR_1_LEFT = (int)VehicleAreaDoor::ROW_1_LEFT;
		constexpr int DOOR_1_RIGHT = (int)VehicleAreaDoor::ROW_1_RIGHT;
		constexpr int OBD2_LIVE_FRAME = (int)VehicleProperty::OBD2_LIVE_FRAME;
		constexpr int OBD2_FREEZE_FRAME = (int)VehicleProperty::OBD2_FREEZE_FRAME;
		constexpr int OBD2_FREEZE_FRAME_INFO = (int)VehicleProperty::OBD2_FREEZE_FRAME_INFO;
		@@ -440,13 +442,13 @@ const ConfigDeclaration kVehicleProperties[]{
		},
		},

		{.config =
		{
		.prop = toInt(VehicleProperty::DOOR_LOCK),
		{.config = {.prop = toInt(VehicleProperty::DOOR_LOCK),
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		.initialValue = {.int32Values = {1}}},
		.areaConfigs = {VehicleAreaConfig{.areaId = DOOR_1_LEFT},
		VehicleAreaConfig{.areaId = DOOR_1_RIGHT}}},
		.initialAreaValues = {{DOOR_1_LEFT, {.int32Values = {1}}},
		{DOOR_1_RIGHT, {.int32Values = {1}}}}},

		{.config =
		{
		@@ -459,23 +461,15 @@ const ConfigDeclaration kVehicleProperties[]{
		},
		.initialValue = {.int64Values = {0, 100000, 200000, 300000, 400000}}},

		{
		.config =
		{
		.prop = ABS_ACTIVE,
		{.config = {.prop = ABS_ACTIVE,
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE},
		.initialValue = {.int32Values = {0}}},

		{
		.config =
		{
		.prop = TRACTION_CONTROL_ACTIVE,
		{.config = {.prop = TRACTION_CONTROL_ACTIVE,
		.access = VehiclePropertyAccess::READ,
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE,
		},
		},
		.changeMode = VehiclePropertyChangeMode::ON_CHANGE},
		.initialValue = {.int32Values = {0}}},

		{.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),
		.access = VehiclePropertyAccess::READ,

graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp

+13 −11

Original line number	Diff line number	Diff line
		@@ -858,6 +858,7 @@ Error HWC2On1Adapter::Display::setColorMode(android_color_mode_t mode) {
		return Error::Unsupported;
		}

		if (mDevice.mHwc1MinorVersion >= 4) {
		uint32_t hwc1Config = 0;
		auto error = mActiveConfig->getHwc1IdForColorMode(mode, &hwc1Config);
		if (error != Error::None) {
		@@ -865,12 +866,13 @@ Error HWC2On1Adapter::Display::setColorMode(android_color_mode_t mode) {
		}

		ALOGV("[%" PRIu64 "] Setting HWC1 config %u", mId, hwc1Config);
		int intError = mDevice.mHwc1Device->setActiveConfig(mDevice.mHwc1Device,
		mHwc1Id, hwc1Config);
		int intError =
		mDevice.mHwc1Device->setActiveConfig(mDevice.mHwc1Device, mHwc1Id, hwc1Config);
		if (intError != 0) {
		ALOGE("[%" PRIu64 "] Failed to set HWC1 config (%d)", mId, intError);
		return Error::Unsupported;
		}
		}

		mActiveColorMode = mode;
		return Error::None;