commit 62f0399f532918dc6669c5215f561555f8f8d49f
author Linux Build Service Account <lnxbuild@localhost> Mon Dec 17 17:35:36 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Dec 17 17:35:36 2012 -0800
tree e6b9b1e3d794a8565805b75c980708db4a3be6cc
parent d74f5f3e4c4132f71326cec704352da92211cc7c
parent c180c4eba4650561a54b038a80e6f8030f481cd5

Merge "gralloc: set ION_SECURE to flags instead of heap_mask during ion alloc."

libgralloc/ionalloc.cpp

diff --git a/libgralloc/ionalloc.cpp b/libgralloc/ionalloc.cpp
index b9b9717..8cee7fd 100644
--- a/libgralloc/ionalloc.cpp
+++ b/libgralloc/ionalloc.cpp
@@ -69,14 +69,18 @@
     struct ion_handle_data handle_data;
     struct ion_fd_data fd_data;
     struct ion_allocation_data ionAllocData;
-
     void *base = 0;
 
     ionAllocData.len = data.size;
     ionAllocData.align = data.align;
-    ionAllocData.heap_mask = data.flags;
+    ionAllocData.heap_mask = data.flags & ~ION_SECURE;
     ionAllocData.flags = data.uncached ? 0 : ION_FLAG_CACHED;
 
+    // ToDo: replace usage of alloc data structure with
+    //  ionallocdata structure.
+    if (data.flags & ION_SECURE)
+        ionAllocData.flags |= ION_SECURE;
+
     err = open_device();
     if (err)
         return err;