Merge "Revert^2 "Fix headers in Gralloc.h."" into main (0ba7c7f2) · Commits · e / os / android_frameworks_native

libs/ui/Gralloc5.cpp

+11 −1

Original line number	Diff line number	Diff line
		@@ -20,14 +20,24 @@
		#include <ui/Gralloc5.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 <android/binder_manager.h>
		#include <android/hardware/graphics/mapper/IMapper.h>
		#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>
		#include <binder/IPCThreadState.h>
		#include <dlfcn.h>
		#include <gralloctypes/Gralloc4.h>
		#include <ui/FatVector.h>
		#include <ui/GraphicTypes.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::common;
		using namespace ::android::hardware::graphics::mapper;

+6 −3

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

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

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

		namespace android {