Disable nfc proprietary factoryota registersandroid-r-preview-4android-r-preview-3android-r-preview-2

Bug: 150511341
Test: configuration loaded
Change-Id: Ic361a1b18571333dddfcc912844dcb8f0022268f

6 files changed, 24 insertions, 12 deletions

diff --git a/nfc/libnfc-nxp.bonito.conf b/nfc/libnfc-nxp.bonito.conf
index f8af636f..db47eb1d 100644
--- a/nfc/libnfc-nxp.bonito.conf
+++ b/nfc/libnfc-nxp.bonito.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 01,
     A0, ED, 01, 01,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 19, 00, 19, 00, 19, 00, 19, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################
diff --git a/nfc/libnfc-nxp.bonito.ese.conf b/nfc/libnfc-nxp.bonito.ese.conf
index f22f67a5..5b513823 100644
--- a/nfc/libnfc-nxp.bonito.ese.conf
+++ b/nfc/libnfc-nxp.bonito.ese.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 00,
     A0, ED, 01, 01,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 19, 00, 19, 00, 19, 00, 19, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################
diff --git a/nfc/libnfc-nxp.bonito.uicc.conf b/nfc/libnfc-nxp.bonito.uicc.conf
index 943c6b7c..93ed9dd7 100644
--- a/nfc/libnfc-nxp.bonito.uicc.conf
+++ b/nfc/libnfc-nxp.bonito.uicc.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 01,
     A0, ED, 01, 00,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 19, 00, 19, 00, 19, 00, 19, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################
diff --git a/nfc/libnfc-nxp.sargo.conf b/nfc/libnfc-nxp.sargo.conf
index 93850994..85dbafa0 100644
--- a/nfc/libnfc-nxp.sargo.conf
+++ b/nfc/libnfc-nxp.sargo.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 01,
     A0, ED, 01, 01,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 0F, 00, 0F, 00, 0F, 00, 0F, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################
diff --git a/nfc/libnfc-nxp.sargo.ese.conf b/nfc/libnfc-nxp.sargo.ese.conf
index 88211ead..2be206e2 100644
--- a/nfc/libnfc-nxp.sargo.ese.conf
+++ b/nfc/libnfc-nxp.sargo.ese.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 00,
     A0, ED, 01, 01,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 0F, 00, 0F, 00, 0F, 00, 0F, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################
diff --git a/nfc/libnfc-nxp.sargo.uicc.conf b/nfc/libnfc-nxp.sargo.uicc.conf
index bcf66890..7d49c941 100644
--- a/nfc/libnfc-nxp.sargo.uicc.conf
+++ b/nfc/libnfc-nxp.sargo.uicc.conf
@@ -165,7 +165,7 @@ NXP_RF_CONF_BLK_6={
 # SWP1A interface A0D4
 # DWP intf behavior config, SVDD Load activated by default if set to 0x31 A037
 # SPI CL Sync enable  A098
-NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
+NXP_CORE_CONF_EXTN={20, 02, 6B, 16,
     A0, 06, 01, 01,
     A0, EC, 01, 01,
     A0, ED, 01, 00,
@@ -185,7 +185,9 @@ NXP_CORE_CONF_EXTN={20, 02, 5F, 14,
     A0, 38, 04, 1A, 0B, 0B, 00,
     A0, 3A, 08, 0F, 00, 0F, 00, 0F, 00, 0F, 00,
     A0, B2, 01, 19,
-    A0, 91, 01, 01
+    A0, 91, 01, 01,
+    A0, 08, 02, 00, 00,
+    A0, 88, 04, 00, 96, 96, 03
 }
 
 ###############################################################################