commit 7f92fce427043d9904c9e52d21bc548be1d78e3c
author Ben Cheng <bccheng@google.com> Thu Feb 21 14:17:07 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 21 14:17:07 2013 -0800
tree 1bb80b6dc316c76d3a899dc37ab43c8fc0994ed1
parent 17a2ab9f861eef8aea14f988487bace21c0c8e5d
parent a0f5038c59ebc7b66eff2ee432569ac3cb74f4ab

am a0f5038c: resolved conflicts for merge of 02459827 to stage-aosp-master

* commit 'a0f5038c59ebc7b66eff2ee432569ac3cb74f4ab':
  Add missing ioctls used by NFC.

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",