commit 7dc06d1046a3ed7690c50fdee0b1a32bdeb43f67
author Naseer Ahmed <naseer@codeaurora.org> Tue Mar 14 11:13:27 2017 -0400
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Mar 14 09:45:29 2017 -0700
tree 4be805413e030c3c3ad4cceffe72b73cef43feba
parent 692f91424dbca1d28c30a2a6ef32b1a85d6fff67

gralloc1: Fix sign conversion error

CRs-Fixed: 2019290
Change-Id: I512656aa42158d47a5a0fcb5a430ccb65a1344e7

libgralloc1/gr_allocator.cpp

diff --git a/libgralloc1/gr_allocator.cpp b/libgralloc1/gr_allocator.cpp
index d6e2ff9..aba6dc5 100644
--- a/libgralloc1/gr_allocator.cpp
+++ b/libgralloc1/gr_allocator.cpp
@@ -523,7 +523,7 @@
                                unsigned int *alloc_type, unsigned int *ion_flags) {
   unsigned int heap_id = 0;
   unsigned int type = 0;
-  unsigned int flags = 0;
+  uint32_t flags = 0;
   if (prod_usage & GRALLOC1_PRODUCER_USAGE_PROTECTED) {
     if (cons_usage & GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY) {
       heap_id = ION_HEAP(SD_HEAP_ID);
@@ -531,17 +531,17 @@
        * There is currently no flag in ION for Secure Display
        * 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) {
       heap_id = ION_HEAP(SD_HEAP_ID);
       if (cons_usage & GRALLOC1_CONSUMER_USAGE_HWCOMPOSER) {
-        flags |= ION_SC_PREVIEW_FLAGS;
+        flags |= UINT(ION_SC_PREVIEW_FLAGS);
       } else {
-        flags |= ION_SC_FLAGS;
+        flags |= UINT(ION_SC_FLAGS);
       }
     } else {
       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) {
     // MM Heap is exclusively a secure heap.
@@ -558,7 +558,7 @@
     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;
   }