LineageOS/android_vendor_qcom_opensource_display-commonsys-intf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "gralloc1: Fix sign conversion error"

Browse Source
This commit is contained in:
Linux Build Service Account
2017-03-16 13:41:51 -07:00
committed by Gerrit - the friendly Code Review server
parent cfa399d5ac 7dc06d1046
commit 72d3062d41
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgralloc1/gr_allocator.cpp
View File

@@ -523,7 +523,7 @@ void Allocator::GetIonHeapInfo(gralloc1_producer_usage_t prod_usage,
unsigned int *alloc_type, unsigned int *ion_flags) { unsigned int *alloc_type, unsigned int *ion_flags) {
unsigned int heap_id = 0; unsigned int heap_id = 0;
unsigned int type = 0; unsigned int type = 0;
unsigned int flags = 0; uint32_t flags = 0;
if (prod_usage & GRALLOC1_PRODUCER_USAGE_PROTECTED) { if (prod_usage & GRALLOC1_PRODUCER_USAGE_PROTECTED) {
if (cons_usage & GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY) { if (cons_usage & GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY) {
heap_id = ION_HEAP(SD_HEAP_ID); heap_id = ION_HEAP(SD_HEAP_ID);
@@ -531,17 +531,17 @@ void Allocator::GetIonHeapInfo(gralloc1_producer_usage_t prod_usage,
* There is currently no flag in ION for Secure Display * There is currently no flag in ION for Secure Display
* VM. Please add it to the define once available. * VM. Please add it to the define once available.
*/ */
flags |= ION_SD_FLAGS; flags |= UINT(ION_SD_FLAGS);
} else if (prod_usage & GRALLOC1_PRODUCER_USAGE_CAMERA) { } else if (prod_usage & GRALLOC1_PRODUCER_USAGE_CAMERA) {
heap_id = ION_HEAP(SD_HEAP_ID); heap_id = ION_HEAP(SD_HEAP_ID);
if (cons_usage & GRALLOC1_CONSUMER_USAGE_HWCOMPOSER) { if (cons_usage & GRALLOC1_CONSUMER_USAGE_HWCOMPOSER) {
flags |= ION_SC_PREVIEW_FLAGS; flags |= UINT(ION_SC_PREVIEW_FLAGS);
} else { } else {
flags |= ION_SC_FLAGS; flags |= UINT(ION_SC_FLAGS);
} }
} else { } else {
heap_id = ION_HEAP(CP_HEAP_ID); heap_id = ION_HEAP(CP_HEAP_ID);
flags |= ION_CP_FLAGS; flags |= UINT(ION_CP_FLAGS);
} }
} else if (prod_usage & GRALLOC1_PRODUCER_USAGE_PRIVATE_MM_HEAP) { } else if (prod_usage & GRALLOC1_PRODUCER_USAGE_PRIVATE_MM_HEAP) {
// MM Heap is exclusively a secure heap. // MM Heap is exclusively a secure heap.
@@ -558,7 +558,7 @@ void Allocator::GetIonHeapInfo(gralloc1_producer_usage_t prod_usage,
heap_id |= ION_HEAP(ION_ADSP_HEAP_ID); heap_id |= ION_HEAP(ION_ADSP_HEAP_ID);
} }
if (flags & ION_SECURE) { if (flags & UINT(ION_SECURE)) {
type |= private_handle_t::PRIV_FLAGS_SECURE_BUFFER; type |= private_handle_t::PRIV_FLAGS_SECURE_BUFFER;
} }