Snap for 12283639 from 5b43d645748c8d52bfaabd6c112c3e1d60ff4b76 to 24Q4-release (86a2e5ec) · Commits · e / os / android_hardware_interfaces

PREUPLOAD.cfg

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ ignore_merged_commits = true
		bpfmt = true
		clang_format = true
		aidl_format = true
		gofmt = true

		[Hook Scripts]
		aosp_hook_confirmationui = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} confirmationui

+7 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,10 @@
		#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>
		#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyAccess.h>

		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		#include <PerDisplayMaxBrightness.h>
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

		#include <unordered_map>

		namespace aidl {
		@@ -302,6 +306,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyAccess> AccessForVehiclePrope
		{VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyAccess::READ},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyAccess::READ_WRITE},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyAccess::READ},
		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		{PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyAccess::READ},
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		};

		} // namespace vehicle

+7 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,10 @@
		#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>
		#include <aidl/android/hardware/automotive/vehicle/VehiclePropertyChangeMode.h>

		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		#include <PerDisplayMaxBrightness.h>
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

		#include <unordered_map>

		namespace aidl {
		@@ -302,6 +306,9 @@ std::unordered_map<VehicleProperty, VehiclePropertyChangeMode> ChangeModeForVehi
		{VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, VehiclePropertyChangeMode::ON_CHANGE},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, VehiclePropertyChangeMode::ON_CHANGE},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, VehiclePropertyChangeMode::ON_CHANGE},
		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		{PER_DISPLAY_MAX_BRIGHTNESS, VehiclePropertyChangeMode::STATIC},
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		};

		} // namespace vehicle

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

		namespace aidl::android::hardware::automotive::vehicle {

		// Same as VehicleProperty::PER_DISPLAY_MAX_BRIGHTNESS as defined in v4.
		static constexpr VehicleProperty PER_DISPLAY_MAX_BRIGHTNESS = (VehicleProperty)0x11410F4E;

		} // namespace aidl::android::hardware::automotive::vehicle

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@

		#include <aidl/android/hardware/automotive/vehicle/VehicleProperty.h>

		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		#include <PerDisplayMaxBrightness.h>
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.

		#include <unordered_map>

		namespace aidl {
		@@ -301,6 +305,9 @@ std::unordered_map<VehicleProperty, int32_t> VersionForVehicleProperty = {
		{VehicleProperty::CROSS_TRAFFIC_MONITORING_WARNING_STATE, 3},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_ENABLED, 3},
		{VehicleProperty::LOW_SPEED_AUTOMATIC_EMERGENCY_BRAKING_STATE, 3},
		// Start manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		{PER_DISPLAY_MAX_BRIGHTNESS, 2},
		// End manual edit: backport PER_DISPLAY_MAX_BRIGHTNESS.
		};

		} // namespace vehicle