commit a84c539581aea03f75db71a5f6b68aa27511b210
author android-build-team Robot <android-build-team-robot@google.com> Sat Sep 21 00:52:35 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Sep 21 00:52:35 2019 +0000
tree bc33e9671a8e1887d5f4ccf21350b8e5fb8df9fc
parent 30a93555b567af7b7cc3be4d2e189d9b4d0057f9
parent 3479e056bf27aa2a18d1b18ed2111340b1ae9b53

Merge cherrypicks of [9434351, 9434801, 9434688, 9434802, 9434034, 9434035, 9434608, 9434036] into qt-c2f2-release

Change-Id: Ia90a3f9eb1489b63709ca04041d2de81ea29c576

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.
 }