commit b0eb37f8d49caa86f61fee461addb20503914947
author Sean Callanan <spyffe@google.com> Thu Dec 14 01:26:44 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 14 01:26:44 2023 +0000
tree a508cb65119b65346d5fdef28bec836659e434b5
parent b3f0912eb7bd661c5ed210d6dc69e7e0c3712e9c
parent 2dc6bcd1aed4223ae190ce9ee0114dee339e000f

Merge "Revert "Use memfd on placeholder buffers"" into main

gralloc4/src/allocator/mali_gralloc_ion.cpp

diff --git a/gralloc4/src/allocator/mali_gralloc_ion.cpp b/gralloc4/src/allocator/mali_gralloc_ion.cpp
index c66c54a..3a955d9 100644
--- a/gralloc4/src/allocator/mali_gralloc_ion.cpp
+++ b/gralloc4/src/allocator/mali_gralloc_ion.cpp
@@ -30,7 +30,6 @@
 #include <utils/Trace.h>
 
 #include <linux/dma-buf.h>
-#include <linux/memfd.h>
 #include <vector>
 #include <sys/ioctl.h>
 
@@ -223,12 +222,7 @@
 	std::stringstream tag;
 	tag << "heap: " << heap_name << ", bytes: " << size;
 	ATRACE_NAME(tag.str().c_str());
-	int shared_fd = -1;
-
-	// memfd requires matching sepolicy allowing r/w access to tmpfs.
-	if (use_placeholder) shared_fd = memfd_create(heap_name.c_str(), 0);
-	else shared_fd = get_allocator().Alloc(heap_name, size, 0);
-
+	int shared_fd = get_allocator().Alloc(heap_name, size, 0);
 	if (shared_fd < 0)
 	{
 		ALOGE("Allocation failed for heap %s error: %d\n", heap_name.c_str(), shared_fd);