Merge "Revert "Fix headers in Gralloc.h."" into main (9a0733a2) · Commits · e / os / android_frameworks_native

libs/ui/Gralloc5.cpp

+1 −11

Original line number	Original line	Diff line number	Diff line
	@@ -20,24 +20,14 @@
	#include <ui/Gralloc5.h>		#include <ui/Gralloc5.h>

	#include <aidl/android/hardware/graphics/allocator/AllocationError.h>		#include <aidl/android/hardware/graphics/allocator/AllocationError.h>
	#include <aidl/android/hardware/graphics/allocator/BufferDescriptorInfo.h>
	#include <aidl/android/hardware/graphics/common/StandardMetadataType.h>
	#include <aidlcommonsupport/NativeHandle.h>		#include <aidlcommonsupport/NativeHandle.h>
	#include <android/binder_manager.h>		#include <android/binder_manager.h>
	#include <android/hardware/graphics/mapper/IMapper.h>
	#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>		#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>
			#include <binder/IPCThreadState.h>
	#include <dlfcn.h>		#include <dlfcn.h>
	#include <gralloctypes/Gralloc4.h>
	#include <ui/FatVector.h>		#include <ui/FatVector.h>
	#include <ui/GraphicTypes.h>
	#include <vndksupport/linker.h>		#include <vndksupport/linker.h>

	#include <cstdint>
	#include <memory>
	#include <sstream>
	#include <string>
	#include <vector>

	using namespace aidl::android::hardware::graphics::allocator;		using namespace aidl::android::hardware::graphics::allocator;
	using namespace aidl::android::hardware::graphics::common;		using namespace aidl::android::hardware::graphics::common;
	using namespace ::android::hardware::graphics::mapper;		using namespace ::android::hardware::graphics::mapper;

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -17,18 +17,15 @@
	#ifndef ANDROID_UI_GRALLOC_H		#ifndef ANDROID_UI_GRALLOC_H
	#define ANDROID_UI_GRALLOC_H		#define ANDROID_UI_GRALLOC_H

	#include <cutils/native_handle.h>		#include <gralloctypes/Gralloc4.h>
	#include <system/graphics.h>		#include <hidl/HidlSupport.h>
	#include <ui/GraphicTypes.h>		#include <ui/GraphicTypes.h>
	#include <ui/PixelFormat.h>		#include <ui/PixelFormat.h>
	#include <ui/Rect.h>		#include <ui/Rect.h>
	#include <utils/Errors.h>		#include <utils/StrongPointer.h>
	#include "GraphicBufferAllocator.h"		#include "GraphicBufferAllocator.h"

	#include <cstdint>
	#include <optional>
	#include <string>		#include <string>
	#include <vector>

	namespace android {		namespace android {