commit c180c4eba4650561a54b038a80e6f8030f481cd5
author Amara Venkata Mastan Manoj Kumar <manojavm@codeaurora.org> Tue Oct 09 10:13:55 2012 -0700
committer Mitchel Humpherys <mitchelh@codeaurora.org> Tue Dec 11 17:46:57 2012 -0800
tree 1e85e3b3f46f54961ddc2cc05bbef612f4ca5e97
parent d95c4083ccc98f795847c34c6574e8a219e4cf7c

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

  This is required for Secure Playback usecase.

Change-Id: I590bf126a35465286a9487490a114af82732e262

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;