release-request-631994b2-37c0-4d03-8caa-bfd01530db29-for-git_pi-release-4269836 snap-temp-L23500000092503827
Change-Id: I82e80935d3bce7532a706f196134eaafc8364d48
diff --git a/esed/esed.rc b/esed/esed.rc
index 73d6223..572254a 100644
--- a/esed/esed.rc
+++ b/esed/esed.rc
@@ -8,7 +8,7 @@
restorecon /data/vendor/ese
start ese_load
-service ese_load /vendor/bin/ese_load auto
+service ese_load /vendor/bin/ese_load force
disabled
oneshot
user ese
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: