commit ad76c722fc6377670cbeebd2aa11d2f51306becf
author Chia-I Wu <olv@google.com> Thu Mar 09 21:41:37 2017 +0000
committer gitbuildkicker <android-build@google.com> Thu Mar 09 14:27:10 2017 -0800
tree 3f1fe3ced4f41895ef1872a1c1d922fee2968d9e
parent 1b62cab9555ab30b83aa38a8ae9e16b569c66576

Revert "gralloc0: Map in registerBuffer only for USAGE_HW_TEXTURE"

This reverts commit da449ce3916d0c74352ef476632ad0a74bcdf8e9.

Bug: 36082388
Change-Id: Ib6992c22319208ef5c89b6423255bd87353772d6
(cherry picked from commit b7d25ca64e8e64d0fcb6f81e9dd14bb1dd6b96d2)

msm8996/libgralloc/mapper.cpp

diff --git a/msm8996/libgralloc/mapper.cpp b/msm8996/libgralloc/mapper.cpp
index 62bc0ff..2ecb491 100644
--- a/msm8996/libgralloc/mapper.cpp
+++ b/msm8996/libgralloc/mapper.cpp
@@ -173,18 +173,10 @@
     if (!module || private_handle_t::validate(handle) < 0)
         return -EINVAL;
 
-    int err = 0;
-    private_handle_t* hnd = (private_handle_t*)handle;
-    if (!(hnd->flags & private_handle_t::PRIV_FLAGS_HW_TEXTURE)  &&
-        (hnd->flags & (private_handle_t::PRIV_FLAGS_CAMERA_READ |
-            private_handle_t::PRIV_FLAGS_CAMERA_WRITE))) {
-        return err;
-    } else {
-        err = gralloc_map(module, handle);
-        /* Do not fail register_buffer for secure buffers*/
-        if (err == -EACCES)
-            err = 0;
-    }
+    int err =  gralloc_map(module, handle);
+    /* Do not fail register_buffer for secure buffers*/
+    if (err == -EACCES)
+        err = 0;
     return err;
 }