commit a0f5038c59ebc7b66eff2ee432569ac3cb74f4ab
author Ben Cheng <bccheng@google.com> Wed Feb 20 18:01:55 2013 -0800
committer Ben Cheng <bccheng@google.com> Wed Feb 20 18:01:55 2013 -0800
tree 1bb80b6dc316c76d3a899dc37ab43c8fc0994ed1
parent 42812ca7626df45d11ab08d53b69d4e83c9412de
parent 024598273d0864e49467ad70abeb5aa42c422687

resolved conflicts for merge of 02459827 to stage-aosp-master

Change-Id: Ib6d2b1eef7dc35e8acd36ddf6db3ff81fac5fa98

main/coregrind/m_syswrap/syswrap-linux.c

diff --git a/main/coregrind/m_syswrap/syswrap-linux.c b/main/coregrind/m_syswrap/syswrap-linux.c
index 2f1155f..fbee4f8 100644
--- a/main/coregrind/m_syswrap/syswrap-linux.c
+++ b/main/coregrind/m_syswrap/syswrap-linux.c
@@ -4295,6 +4295,21 @@
                     unsigned int, fd, unsigned int, request);
       return;
 
+#  if defined(ANDROID_HARDWARE_nexus_10)
+   /* undocumented ioctl ids noted on the device */
+   case 0x4d07:
+   case 0x6101:
+   case 0xfa01: /* used by NFC */
+   case 0xfa05: /* used by NFC */
+      return;
+#  elif defined(ANDROID_HARDWARE_nexus_7)
+   /* undocumented ioctl ids noted on the device */
+   case 0x4e04:
+   case 0x7231:
+   case 0x4004e901: /* used by NFC */
+      return;
+#  endif
+
    default:
       PRINT("sys_ioctl ( %ld, 0x%lx, 0x%lx )",ARG1,ARG2,ARG3);
       PRE_REG_READ3(long, "ioctl",