summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Tomas <dtomas.nxp@gmail.com>2011-07-25 12:21:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-25 12:21:24 -0700
commite1e26c9d0f067b2e52bcbfc59a87eba489039fa2 (patch)
tree80248a6a7987c1a97ace725a467ab2fafc15fbfa
parent9e6b5d1f092fab35e497f81035586afae529cda6 (diff)
parent7aedb9c2ae08b424c58628261befa97bdf0052e1 (diff)
downloadpackages_apps_nfc-e1e26c9d0f067b2e52bcbfc59a87eba489039fa2.zip
packages_apps_nfc-e1e26c9d0f067b2e52bcbfc59a87eba489039fa2.tar.gz
packages_apps_nfc-e1e26c9d0f067b2e52bcbfc59a87eba489039fa2.tar.bz2
am 7aedb9c2: Patch to enable the Card Emulation detection mechanism
* commit '7aedb9c2ae08b424c58628261befa97bdf0052e1': Patch to enable the Card Emulation detection mechanism
-rw-r--r--jni/com_android_nfc_NativeNfcManager.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/jni/com_android_nfc_NativeNfcManager.cpp b/jni/com_android_nfc_NativeNfcManager.cpp
index e4544c3..cdbfa82 100644
--- a/jni/com_android_nfc_NativeNfcManager.cpp
+++ b/jni/com_android_nfc_NativeNfcManager.cpp
@@ -26,7 +26,7 @@
#define ERROR_BUFFER_TOO_SMALL -12
#define ERROR_INSUFFICIENT_RESOURCES -9
-#define EEDATA_SETTINGS_NUMBER 28
+#define EEDATA_SETTINGS_NUMBER 29
static phLibNfc_sConfig_t gDrvCfg;
void *gHWRef;
@@ -106,6 +106,9 @@ uint8_t EEDATA_Settings[EEDATA_SETTINGS_NUMBER][4] = {
// Set NFCT ATQA
,{0x00, 0x98, 0x7D, 0x02}
,{0x00, 0x98, 0x7E, 0x00}
+
+ // Enable CEA detection mechanism
+ ,{0x00, 0x9F, 0xC8, 0x01}
};
/* Internal functions declaration */