diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-12-06 23:32:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-12-06 23:32:09 +0000 |
| commit | c560ace415ceeffa317c93699809b4b380fe6dd7 (patch) | |
| tree | 214d273d3b497cc1707ea96374f439a690b8e8b8 /gralloc4/src | |
| parent | 86ae234943310f3b611833638855ff37c369f7aa (diff) | |
| parent | 8a75eafef3f1198e0a32290d3de29c9b59a10f73 (diff) | |
| download | gchips-c560ace415ceeffa317c93699809b4b380fe6dd7.tar.gz | |
Merge "Do not use "Unnamed" as default name"
Diffstat (limited to 'gralloc4/src')
| -rw-r--r-- | gralloc4/src/allocator/mali_gralloc_ion.cpp | 2 | ||||
| -rw-r--r-- | gralloc4/src/core/mali_gralloc_bufferdescriptor.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gralloc4/src/allocator/mali_gralloc_ion.cpp b/gralloc4/src/allocator/mali_gralloc_ion.cpp index 153223a..bfd92d7 100644 --- a/gralloc4/src/allocator/mali_gralloc_ion.cpp +++ b/gralloc4/src/allocator/mali_gralloc_ion.cpp @@ -363,7 +363,7 @@ int ion_device::alloc_from_dmabuf_heap(const std::string& heap_name, size_t size ALOGE("Allocation failed for heap %s error: %d\n", heap_name.c_str(), shared_fd); } - if (!buffer_name.empty() && buffer_name != "Unnamed") { + if (!buffer_name.empty()) { if (buffer_allocator->DmabufSetName(shared_fd, buffer_name)) { ALOGW("Unable to set buffer name %s: %s", buffer_name.c_str(), strerror(errno)); } diff --git a/gralloc4/src/core/mali_gralloc_bufferdescriptor.h b/gralloc4/src/core/mali_gralloc_bufferdescriptor.h index 3c7c45f..826af79 100644 --- a/gralloc4/src/core/mali_gralloc_bufferdescriptor.h +++ b/gralloc4/src/core/mali_gralloc_bufferdescriptor.h @@ -66,7 +66,6 @@ struct buffer_descriptor_t hal_format(0), layer_count(0), format_type(MALI_GRALLOC_FORMAT_TYPE_USAGE), - name("Unnamed"), reserved_size(0), pixel_stride(0), alloc_format(0), |