summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnkit Goyal <layog@google.com>2023-06-14 20:47:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-14 20:47:24 +0000
commit848b59ca5ba68e8f6068566db975398ec2d3c1ca (patch)
tree601c2b27e689eb2c2b7ee99589a93ea48a44cadb
parent0967f6befd7120acb727df4fa898af1435e6dde4 (diff)
parent525e87144865e6e0d5574b1875f1ce43fe83389d (diff)
downloadgchips-848b59ca5ba68e8f6068566db975398ec2d3c1ca.tar.gz
gralloc4: Use framebuffer-secure for screenshot buffers am: 525e871448
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/23666956 Change-Id: Id26d78f14a1703767067b5bb90512f629c172aac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--gralloc4/src/allocator/mali_gralloc_ion.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/gralloc4/src/allocator/mali_gralloc_ion.cpp b/gralloc4/src/allocator/mali_gralloc_ion.cpp
index 183d8a0..5f7fc26 100644
--- a/gralloc4/src/allocator/mali_gralloc_ion.cpp
+++ b/gralloc4/src/allocator/mali_gralloc_ion.cpp
@@ -86,7 +86,7 @@ std::string select_dmabuf_heap(uint64_t usage)
std::string name;
};
- static const std::array<HeapSpecifier, 6> exact_usage_heaps =
+ static const std::array<HeapSpecifier, 7> exact_usage_heaps =
{{
// Faceauth heaps
{ // isp_image_heap
@@ -116,6 +116,12 @@ std::string select_dmabuf_heap(uint64_t usage)
GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB,
find_first_available_heap({kDmabufFramebufferSecureHeapName, kDmabufVframeSecureHeapName})
},
+
+ {
+ GRALLOC_USAGE_PROTECTED | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER |
+ GRALLOC_USAGE_HW_COMPOSER,
+ find_first_available_heap({kDmabufFramebufferSecureHeapName, kDmabufVframeSecureHeapName})
+ },
}};
static const std::array<HeapSpecifier, 8> inexact_usage_heaps =