DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: I9ffd208fe9081e9bd3cda8c562d6121498c83868
diff --git a/device.mk b/device.mk
index 9f5b56f..dab7da2 100644
--- a/device.mk
+++ b/device.mk
@@ -788,4 +788,4 @@
# Increment the SVN for any official public releases
PRODUCT_PROPERTY_OVERRIDES += \
- ro.vendor.build.svn=6
+ ro.vendor.build.svn=7
diff --git a/nfc/libnfc-nxp.blueline.conf b/nfc/libnfc-nxp.blueline.conf
index 01f953b..2ea13bf 100644
--- a/nfc/libnfc-nxp.blueline.conf
+++ b/nfc/libnfc-nxp.blueline.conf
@@ -191,7 +191,7 @@
###############################################################################
# Core configuration settings
-NXP_CORE_CONF={ 20, 02, 31, 0F,
+NXP_CORE_CONF={ 20, 02, 2D, 0F,
85, 01, 01,
28, 01, 00,
21, 01, 00,
@@ -199,7 +199,7 @@
31, 01, 03,
32, 01, 60,
38, 01, 01,
- 33, 04, 01, 02, 03, 04,
+ 33, 00,
54, 01, 06,
50, 01, 02,
5B, 01, 00,
diff --git a/nfc/libnfc-nxp.crosshatch.conf b/nfc/libnfc-nxp.crosshatch.conf
index ee8dc04..322a78c 100644
--- a/nfc/libnfc-nxp.crosshatch.conf
+++ b/nfc/libnfc-nxp.crosshatch.conf
@@ -190,7 +190,7 @@
###############################################################################
# Core configuration settings
-NXP_CORE_CONF={ 20, 02, 31, 0F,
+NXP_CORE_CONF={ 20, 02, 2D, 0F,
85, 01, 01,
28, 01, 00,
21, 01, 00,
@@ -198,7 +198,7 @@
31, 01, 03,
32, 01, 60,
38, 01, 01,
- 33, 04, 01, 02, 03, 04,
+ 33, 00,
54, 01, 06,
50, 01, 02,
5B, 01, 00,
