Snap for 7880955 from b69e0a1dd0cf1a51e622861f1eea63fce837a03d to sc-v2-release am: 2a3cab0971android12L-gsi

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/16182914

Change-Id: I48d25b9934dbc4df1c377b52efcdbed4ddfce48f

7 files changed, 5 insertions, 132 deletions

diff --git a/gralloc4/src/4.x/Android.bp b/gralloc4/src/4.x/Android.bp
index b093eab..3de9da9 100644
--- a/gralloc4/src/4.x/Android.bp
+++ b/gralloc4/src/4.x/Android.bp
@@ -85,7 +85,6 @@ cc_library_shared {
 		"GrallocAllocator.cpp",
 		":libgralloc_hidl_common_allocator",
 		":libgralloc_hidl_common_shared_metadata",
-		":libgralloc_src_log",
 	],
 	include_dirs: [
 		"hardware/google/gchips/include",
@@ -109,7 +108,6 @@ cc_library_shared {
 		":libgralloc_hidl_common_mapper",
 		":libgralloc_hidl_common_mapper_metadata",
 		":libgralloc_hidl_common_shared_metadata",
-		":libgralloc_src_log",
 	],
 	include_dirs: [
 		"hardware/google/gchips/include",
diff --git a/gralloc4/src/4.x/GrallocAllocator.cpp b/gralloc4/src/4.x/GrallocAllocator.cpp
index 0ac81fd..1a1e563 100644
--- a/gralloc4/src/4.x/GrallocAllocator.cpp
+++ b/gralloc4/src/4.x/GrallocAllocator.cpp
@@ -51,7 +51,6 @@ GrallocAllocator::~GrallocAllocator()
 
 Return<void> GrallocAllocator::allocate(const BufferDescriptor &descriptor, uint32_t count, allocate_cb hidl_cb)
 {
-	log_setup();
 	MALI_GRALLOC_LOGV("Allocation request from process: %lu", callingPid());
 
 	buffer_descriptor_t bufferDescriptor;
diff --git a/gralloc4/src/Android.bp b/gralloc4/src/Android.bp
index e899758..a3a254d 100644
--- a/gralloc4/src/Android.bp
+++ b/gralloc4/src/Android.bp
@@ -35,13 +35,6 @@ cc_library_headers {
 	],
 }
 
-filegroup {
-	name: "libgralloc_src_log",
-	srcs: [
-		"mali_gralloc_log.cpp",
-	],
-}
-
 cc_library_shared {
 	name: "libGralloc4Wrapper",
 	vendor: true,
@@ -56,7 +49,6 @@ cc_library_shared {
 		"core/mali_gralloc_reference.cpp",
 		"core/mali_gralloc_debug.cpp",
 		":libgralloc_hidl_common_shared_metadata",
-		":libgralloc_src_log",
 	],
 	cflags: [
 		"-DGRALLOC_LIBRARY_BUILD=1",
diff --git a/gralloc4/src/allocator/mali_gralloc_ion.cpp b/gralloc4/src/allocator/mali_gralloc_ion.cpp
index 4b96743..e807651 100644
--- a/gralloc4/src/allocator/mali_gralloc_ion.cpp
+++ b/gralloc4/src/allocator/mali_gralloc_ion.cpp
@@ -609,12 +609,6 @@ int mali_gralloc_ion_allocate(const gralloc_buffer_descriptor_t *descriptors,
 			if (ion_fd >= 0 && fidx == 0) {
 				fds[fidx] = ion_fd;
 			} else {
-				// Warn of high memory allocation on size request greater than 200M
-				if (bufDescriptor->alloc_sizes[fidx] > static_cast<uint64_t>(200ull << 20)) {
-					log_info_verbose_as_warning();
-					MALI_GRALLOC_LOGW("Huge memory allocation: %" PRIu64, bufDescriptor->alloc_sizes[fidx]);
-				}
-
 				fds[fidx] = dev->alloc_from_ion_heap(usage, bufDescriptor->alloc_sizes[fidx], ion_flags, &min_pgsz);
 			}
 			if (fds[fidx] < 0)
diff --git a/gralloc4/src/hidl_common/Allocator.cpp b/gralloc4/src/hidl_common/Allocator.cpp
index 76a26cd..8174f05 100644
--- a/gralloc4/src/hidl_common/Allocator.cpp
+++ b/gralloc4/src/hidl_common/Allocator.cpp
@@ -134,7 +134,6 @@ void allocate(const buffer_descriptor_t &bufferDescriptor, uint32_t count, IAllo
 	{
 		hidlBuffers.setToExternal(grallocBuffers.data(), grallocBuffers.size());
 	}
-	log_commit();
 	hidl_cb(error, stride, hidlBuffers);
 
 	/* The application should import the Gralloc buffers using IMapper for
diff --git a/gralloc4/src/mali_gralloc_log.cpp b/gralloc4/src/mali_gralloc_log.cpp
deleted file mode 100644
index b2aacf2..0000000
--- a/gralloc4/src/mali_gralloc_log.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#include <string>
-#include <thread>
-#include <vector>
-
-#include <mali_gralloc_log.h>
-
-class DelayedLogger {
-    public:
-        void setup() {
-            if (setupCalled) {
-                ALOGW("Bug: Log setup called multiple times");
-            }
-
-            setupCalled = true;
-        }
-
-        void add(LogLevel level, std::string log) {
-            if (setupCalled)
-                pendingLogs.emplace_back(make_tuple(level, log));
-            else
-                outputLog(level, log);
-        }
-
-        void commit() {
-            for (const auto& levelLog: pendingLogs) {
-                const LogLevel level = std::get<0>(levelLog);
-                const std::string& log = std::get<1>(levelLog);
-
-                outputLog(level, log);
-            }
-
-            pendingLogs.clear();
-            setupCalled = false;
-            logIV = false;
-        }
-
-        void logInfoVerboseAsWarning() {
-            logIV = true;
-        }
-
-    private:
-
-        void outputLog(const LogLevel level, const std::string& log) {
-            switch (level) {
-                case LogLevel::INFO:
-                    if (logIV)
-                        ALOGW("INFO: %s", log.c_str());
-                    else
-                        ALOGI("%s", log.c_str());
-                    break;
-                case LogLevel::VERBOSE:
-                    if (logIV)
-                        ALOGW("VERBOSE: %s", log.c_str());
-                    else
-                        ALOGV("%s", log.c_str());
-                    break;
-                case LogLevel::WARNING:
-                    ALOGW("%s", log.c_str());
-                    break;
-                case LogLevel::ERROR:
-                    ALOGE("%s", log.c_str());
-                    break;
-            }
-        }
-
-        std::vector<std::tuple<LogLevel, std::string>> pendingLogs = {};
-        bool setupCalled = false;
-        bool logIV = false;
-};
-
-thread_local DelayedLogger delayedLogger;
-
-void log_later(LogLevel level, const char* fmt, ...) {
-    char buf[10000];
-
-    va_list argptr;
-    va_start(argptr, fmt);
-    vsnprintf(buf, 10000, fmt, argptr);
-    va_end(argptr);
-
-    delayedLogger.add(level, std::string(buf));
-}
-
-void log_setup() {
-    delayedLogger.setup();
-}
-
-void log_commit() {
-    delayedLogger.commit();
-}
-
-void log_info_verbose_as_warning() {
-    delayedLogger.logInfoVerboseAsWarning();
-}
diff --git a/gralloc4/src/mali_gralloc_log.h b/gralloc4/src/mali_gralloc_log.h
index 80c607d..aa4e26c 100644
--- a/gralloc4/src/mali_gralloc_log.h
+++ b/gralloc4/src/mali_gralloc_log.h
@@ -21,27 +21,12 @@
 #define LOG_TAG "mali_gralloc"
 #endif
 
-#include <mutex>
-#include <string>
-#include <vector>
-
 #include <log/log.h>
 
-enum class LogLevel {
-  INFO,
-  VERBOSE,
-  WARNING,
-  ERROR
-};
-
-void log_setup();
-void log_later(LogLevel level, const char* fmt, ...);
-void log_commit();
-void log_info_verbose_as_warning();
-
-#define MALI_GRALLOC_LOGI(...) log_later(LogLevel::INFO, __VA_ARGS__);
-#define MALI_GRALLOC_LOGV(...) log_later(LogLevel::VERBOSE, __VA_ARGS__);
-#define MALI_GRALLOC_LOGW(...) log_later(LogLevel::WARNING, __VA_ARGS__);
-#define MALI_GRALLOC_LOGE(...) log_later(LogLevel::ERROR, __VA_ARGS__);
+/* Delegate logging to Android */
+#define MALI_GRALLOC_LOGI(...) ALOGI(__VA_ARGS__)
+#define MALI_GRALLOC_LOGV(...) ALOGV(__VA_ARGS__)
+#define MALI_GRALLOC_LOGW(...) ALOGW(__VA_ARGS__)
+#define MALI_GRALLOC_LOGE(...) ALOGE(__VA_ARGS__)
 
 #endif