Snap for 11811809 from ef0f81fb4595f45990c9517f2369181ce5bb7b69 to 24Q3-release (1ce64b38) · Commits · e / os / android_hardware_interfaces

automotive/audiocontrol/aidl/default/Android.bp

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,15 +30,14 @@ cc_binary {
		defaults: [
		"latest_android_hardware_audio_common_ndk_shared",
		"latest_android_hardware_automotive_audiocontrol_ndk_shared",
		"powerpolicyclient_defaults",
		],
		shared_libs: [
		"android.hardware.audio.common@7.0-enums",
		"android.frameworks.automotive.powerpolicy-V2-ndk",
		"libbase",
		"libbinder_ndk",
		"libcutils",
		"liblog",
		"libpowerpolicyclient",
		],
		srcs: [
		"AudioControl.cpp",

camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp

+15 −14

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <torch_provider_cb.h>
		#include <com_android_internal_camera_flags.h>
		#include <list>
		#include <nativebase/nativebase.h>

		using ::aidl::android::hardware::camera::common::CameraDeviceStatus;
		using ::aidl::android::hardware::camera::common::CameraResourceCost;
		@@ -1675,9 +1676,9 @@ TEST_P(CameraAidlTest, processMultiCaptureRequestPreview) {
		BufferStatus::OK, NativeHandle(), NativeHandle()};
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage)),
		static_cast<uint64_t>(halStream.consumerUsage))),
		halStream.overrideFormat, &buffer_handle);
		graphicBuffers.push_back(buffer_handle);
		outputBuffers[k] = {
		@@ -1896,9 +1897,9 @@ TEST_P(CameraAidlTest, processUltraHighResolutionRequest) {
		NativeHandle(), NativeHandle()};
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage)),
		static_cast<uint64_t>(halStream.consumerUsage))),
		halStream.overrideFormat, &buffer_handle);
		graphicBuffers.push_back(buffer_handle);
		outputBuffers[k] = {
		@@ -2064,9 +2065,9 @@ TEST_P(CameraAidlTest, process10BitDynamicRangeRequest) {
		NativeHandle(), BufferStatus::OK,
		NativeHandle(), NativeHandle()};
		} else {
		auto usage = android_convertGralloc1To0Usage(
		auto usage = ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage));
		static_cast<uint64_t>(halStream.consumerUsage)));
		allocateGraphicBuffer(previewStream.width, previewStream.height, usage,
		halStream.overrideFormat, &buffer_handle);

		@@ -2285,9 +2286,9 @@ TEST_P(CameraAidlTest, processCaptureRequestBurstISO) {
		NativeHandle(), NativeHandle()};
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage),
		static_cast<uint64_t>(halStreams[0].consumerUsage)),
		static_cast<uint64_t>(halStreams[0].consumerUsage))),
		halStreams[0].overrideFormat, &buffers[i]);
		outputBuffer = {halStreams[0].id, bufferId + i, ::android::makeToAidl(buffers[i]),
		BufferStatus::OK, NativeHandle(), NativeHandle()};
		@@ -2385,9 +2386,9 @@ TEST_P(CameraAidlTest, processCaptureRequestInvalidSinglePreview) {
		bufferId = 0;
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage),
		static_cast<uint64_t>(halStreams[0].consumerUsage)),
		static_cast<uint64_t>(halStreams[0].consumerUsage))),
		halStreams[0].overrideFormat, &buffer_handle);
		}

		@@ -2508,9 +2509,9 @@ TEST_P(CameraAidlTest, switchToOffline) {
		} else {
		// jpeg buffer (w,h) = (blobLen, 1)
		allocateGraphicBuffer(jpegBufferSize, /height/ 1,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage)),
		static_cast<uint64_t>(halStream.consumerUsage))),
		halStream.overrideFormat, &buffers[i]);
		outputBuffer = {halStream.id, bufferId + i, ::android::makeToAidl(buffers[i]),
		BufferStatus::OK, NativeHandle(), NativeHandle()};
		@@ -2734,9 +2735,9 @@ TEST_P(CameraAidlTest, flushPreviewRequest) {
		BufferStatus::OK, NativeHandle(), NativeHandle()};
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage),
		static_cast<uint64_t>(halStreams[0].consumerUsage)),
		static_cast<uint64_t>(halStreams[0].consumerUsage))),
		halStreams[0].overrideFormat, &buffer_handle);
		outputBuffer = {halStreams[0].id, bufferId, ::android::makeToAidl(buffer_handle),
		BufferStatus::OK, NativeHandle(), NativeHandle()};

camera/provider/aidl/vts/camera_aidl_test.cpp

+9 −8

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		#include <regex>
		#include <typeinfo>
		#include "utils/Errors.h"
		#include <nativebase/nativebase.h>

		using ::aidl::android::hardware::camera::common::CameraDeviceStatus;
		using ::aidl::android::hardware::camera::common::TorchModeStatus;
		@@ -2340,8 +2341,8 @@ void CameraAidlTest::processCaptureRequestInternal(uint64_t bufferUsage,
		/* We don't look at halStreamConfig.streams[0].consumerUsage
		* since that is 0 for output streams
		*/
		android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage), bufferUsage),
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage), bufferUsage)),
		halStreams[0].overrideFormat, &handle);

		outputBuffer = {halStreams[0].id, bufferId, ::android::makeToAidl(handle),
		@@ -2868,9 +2869,9 @@ void CameraAidlTest::processPreviewStabilizationCaptureRequestInternal(
		/* We don't look at halStreamConfig.streams[0].consumerUsage
		* since that is 0 for output streams
		*/
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER),
		GRALLOC1_CONSUMER_USAGE_HWCOMPOSER)),
		halStreams[0].overrideFormat, &buffer_handle);
		outputBuffer = {halStreams[0].id, bufferId, ::android::makeToAidl(buffer_handle),
		BufferStatus::OK, NativeHandle(), NativeHandle()};
		@@ -3851,9 +3852,9 @@ void CameraAidlTest::processColorSpaceRequest(
		NativeHandle(), BufferStatus::OK,
		NativeHandle(), NativeHandle()};
		} else {
		auto usage = android_convertGralloc1To0Usage(
		auto usage = ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage));
		static_cast<uint64_t>(halStream.consumerUsage)));
		allocateGraphicBuffer(previewStream.width, previewStream.height, usage,
		halStream.overrideFormat, &buffer_handle);

		@@ -4009,9 +4010,9 @@ void CameraAidlTest::processZoomSettingsOverrideRequests(
		NativeHandle(), NativeHandle()};
		} else {
		allocateGraphicBuffer(previewStream.width, previewStream.height,
		android_convertGralloc1To0Usage(
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(
		static_cast<uint64_t>(halStreams[0].producerUsage),
		static_cast<uint64_t>(halStreams[0].consumerUsage)),
		static_cast<uint64_t>(halStreams[0].consumerUsage))),
		halStreams[0].overrideFormat, &buffers[i]);
		outputBuffer = {halStreams[0].id, bufferId + i, ::android::makeToAidl(buffers[i]),
		BufferStatus::OK, NativeHandle(), NativeHandle()};

camera/provider/aidl/vts/device_cb.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <aidlcommonsupport/NativeHandle.h>
		#include <grallocusage/GrallocUsageConversion.h>
		#include <cinttypes>
		#include <nativebase/nativebase.h>

		using ::aidl::android::hardware::camera::device::BufferStatus;
		using ::aidl::android::hardware::camera::device::ErrorMsg;
		@@ -143,8 +144,8 @@ ScopedAStatus DeviceCb::requestStreamBuffers(const std::vector<BufferRequest>& b

		CameraAidlTest::allocateGraphicBuffer(
		w, h,
		android_convertGralloc1To0Usage(static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage)),
		ANDROID_NATIVE_UNSIGNED_CAST(android_convertGralloc1To0Usage(static_cast<uint64_t>(halStream.producerUsage),
		static_cast<uint64_t>(halStream.consumerUsage))),
		halStream.overrideFormat, &handle);

		StreamBuffer streamBuffer = StreamBuffer();

graphics/common/aidl/android/hardware/graphics/common/PixelFormat.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -161,8 +161,7 @@ enum PixelFormat {
		*
		* The allocator should examine the usage bits passed in when allocating a
		* buffer with this format, and it should derive the pixel format from
		* those usage flags. This format must never be used with any of the
		* BufferUsage::CPU_* usage flags.
		* those usage flags.
		*
		* Even when the internally chosen format has an alpha component, the
		* clients must assume the alpha vlaue to be 1.0.