commit 34e4cfdac04fa6cabc7fde77206f998a1043ef41
author Will Drewry <drewry@google.com> Fri Aug 11 21:37:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 11 21:37:39 2017 +0000
tree ead2cc9a323a685d3c208a4521307375af1ec5ed
parent 5d1a45c2721fa3b25d58e974723c4e945cb31b4d
parent c13093ac927527e3015b45094fc6c142c7b5a122

esed.rc: disable hardware version filtering in esed.
am: c13093ac92

Change-Id: I13c9d770c8fc73f0d0389776c38f14fb5f5c6ba0

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..9f8426a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+ascull@google.com
+drewry@google.com

libese-hw/nxp/pn80t/common.c

diff --git a/libese-hw/nxp/pn80t/common.c b/libese-hw/nxp/pn80t/common.c
index 823c92b..fcd6301 100644
--- a/libese-hw/nxp/pn80t/common.c
+++ b/libese-hw/nxp/pn80t/common.c
@@ -174,6 +174,8 @@
 #define ATTACK_COUNTER 0xF2
 #define RESTRICTED_MODE_PENALTY 0xF3
 uint32_t nxp_pn80t_send_cooldown(struct EseInterface *ese, bool end) {
+  struct NxpState *ns = NXP_PN80T_STATE(ese);
+  const struct Pn80tPlatform *platform = ese->ops->opts;
   const static uint8_t kEndofApduSession[] = {0x5a, 0xc5, 0x00, 0xc5};
   const static uint8_t kResetSession[] = {0x5a, 0xc4, 0x00, 0xc4};
   const uint8_t *const message = end ? kEndofApduSession : kResetSession;
@@ -226,6 +228,8 @@
           ALOGI("- Timer 0x%.2X: %d", tag, cooldown);
           if (cooldown > max_wait) {
             max_wait = cooldown;
+            /* Wait 25ms Guard time to make sure eSE is in DPD mode */
+            platform->wait(ns->handle, 25000);
           }
           break;
         default:

third_party/NXPNFC_P61_JCOP_Kit/Android.bp

diff --git a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
index 01ac8dd..9d6e8d0 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
@@ -11,7 +11,16 @@
         "libdl",
         "libhardware",
     ],
-    cflags: ["-DNXP_LDR_SVC_VER_2=TRUE"],
+    cflags: [
+        "-DNXP_LDR_SVC_VER_2=TRUE",
+        "-W", "-Wall",
+        "-Wno-format",
+        "-Wno-parentheses-equality",
+        "-Wno-tautological-constant-out-of-range-compare",
+        "-Wno-unused-function",
+        "-Wno-unused-parameter",
+        "-Wno-unused-variable",
+    ],
     export_include_dirs: [
         "include/",
         "inc/",

third_party/NXPNFC_P61_JCOP_Kit/include/AlaLib.h

diff --git a/third_party/NXPNFC_P61_JCOP_Kit/include/AlaLib.h b/third_party/NXPNFC_P61_JCOP_Kit/include/AlaLib.h
index fdb047a..47873b7 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/include/AlaLib.h
+++ b/third_party/NXPNFC_P61_JCOP_Kit/include/AlaLib.h
@@ -23,6 +23,8 @@
 #ifndef ALALIB_H_
 #define ALALIB_H_
 
+#include <stdio.h>
+
 #include "IChannel.h"
 
 /*******************************************************************************