commit 06695a61ba0c5148972108a03c094ae85531cf1c
author Chia-I Wu <olv@google.com> Mon May 08 12:55:28 2017 -0700
committer Chia-I Wu <olv@google.com> Mon May 08 13:35:44 2017 -0700
tree f41313b5259ea7d3fa341dce704f476750749906
parent 57b9e8ac152ba8b95dbbb4ce2cbfc0fec292532f

gralloc: do not use private_handle_t::ion_hnd

This makes private_handle_t native_handle_clone friendly when
GRALLOC_ARM_UMP_MODULE is not defined.

Bug: 37550237
Test: boots
Change-Id: I6c489eb4f8f6791ab91ddffe55d9ce3dc96509a0

gralloc/gralloc_priv.h

diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h
index b931ac2..547027e 100644
--- a/gralloc/gralloc_priv.h
+++ b/gralloc/gralloc_priv.h
@@ -186,7 +186,7 @@
 	int     offset;
 
 #if GRALLOC_ARM_DMA_BUF_MODULE
-	ion_user_handle_t ion_hnd;
+	ion_user_handle_t ion_hnd_UNUSED;
 #endif
 
 #if GRALLOC_ARM_DMA_BUF_MODULE
@@ -223,7 +223,7 @@
 		offset(0)
 #if GRALLOC_ARM_DMA_BUF_MODULE
 		,
-		ion_hnd(ION_INVALID_HANDLE)
+		ion_hnd_UNUSED(ION_INVALID_HANDLE)
 #endif
 
 	{
@@ -255,7 +255,7 @@
 #endif
 		shallow_fbdev_fd(0),
 		offset(0),
-		ion_hnd(ION_INVALID_HANDLE)
+		ion_hnd_UNUSED(ION_INVALID_HANDLE)
 
 	{
 		version = sizeof(native_handle);
@@ -290,7 +290,7 @@
 		offset(fb_offset)
 #if GRALLOC_ARM_DMA_BUF_MODULE
 		,
-		ion_hnd(ION_INVALID_HANDLE)
+		ion_hnd_UNUSED(ION_INVALID_HANDLE)
 #endif
 
 	{