commit 5a893cbfbc11dd17e5e9d22a74f94807f1230190
author Jun Yin <junyin@google.com> Fri Sep 20 10:37:13 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 10:37:13 2019 -0700
tree bc33e9671a8e1887d5f4ccf21350b8e5fb8df9fc
parent 88e9a64f0bf9b3efee3396f8e427a8eb39a58e60
parent 6955738c9eb2302f21003288edb2d217170f1530

Merge "Remove force FW update at factory reset" into qt-r1-dev
am: 6955738c9e

Change-Id: Ib838fd03f1cbb3780baa1630691f92c77955610e

1.1/hal_st21nfc.cc

diff --git a/1.1/hal_st21nfc.cc b/1.1/hal_st21nfc.cc
index 59823e6..7c5c8c8 100644
--- a/1.1/hal_st21nfc.cc
+++ b/1.1/hal_st21nfc.cc
@@ -408,7 +408,7 @@
 
 void StNfc_hal_factoryReset() {
   STLOG_HAL_D("HAL st21nfc: %s", __func__);
-  hal_wrapper_factoryReset();
+  //hal_wrapper_factoryReset();
   // Nothing needed for factory reset in st21nfc case.
 }
 

1.2/hal_st21nfc.cc

diff --git a/1.2/hal_st21nfc.cc b/1.2/hal_st21nfc.cc
index c7e8d16..643c545 100644
--- a/1.2/hal_st21nfc.cc
+++ b/1.2/hal_st21nfc.cc
@@ -409,7 +409,7 @@
 
 void StNfc_hal_factoryReset() {
   STLOG_HAL_D("HAL st21nfc: %s", __func__);
-  hal_wrapper_factoryReset();
+  //hal_wrapper_factoryReset();
   // Nothing needed for factory reset in st21nfc case.
 }