diff options
| author | Bill Rassieur <rassb@google.com> | 2019-04-02 18:34:10 +0000 |
|---|---|---|
| committer | Bill Rassieur <rassb@google.com> | 2019-04-02 18:34:10 +0000 |
| commit | ae84541f6b55ea8bbf99a11ab4da9048eddd525f (patch) | |
| tree | 8d9193d5aac2809c9269210d353ab1fd06704c35 | |
| parent | 7d0fbeadbf5786d50913df7df158483ece67c23b (diff) | |
| parent | 99a50cb9a89ac159dfb530b5c883d15c25af8ae1 (diff) | |
| download | android_hardware_nxp_nfc-ae84541f6b55ea8bbf99a11ab4da9048eddd525f.tar.gz android_hardware_nxp_nfc-ae84541f6b55ea8bbf99a11ab4da9048eddd525f.tar.bz2 android_hardware_nxp_nfc-ae84541f6b55ea8bbf99a11ab4da9048eddd525f.zip | |
Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: Ic99556f0d4a201fbf170e9e8624bc9fe8bf714db
BUG: 129345239
| -rwxr-xr-x | OWNERS | 4 | ||||
| -rwxr-xr-x | halimpl/hal/phNxpNciHal.cc | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -1,2 +1,4 @@ -kandoiruchi@google.com zachoverflow@google.com +rmojumder@google.com +jackcwyu@google.com +georgekgchang@google.com diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc index 3b39af7..15ebac9 100755 --- a/halimpl/hal/phNxpNciHal.cc +++ b/halimpl/hal/phNxpNciHal.cc @@ -1929,9 +1929,6 @@ void phNxpNciHal_isFactoryOTAModeActive() { NXPLOG_NCIHAL_D("FactoryOTA mode is active"); } else { NXPLOG_NCIHAL_D("FactoryOTA mode is disabled"); - if (property_set("persist.factoryota.reboot", "terminated") < 0) { - NXPLOG_NCIHAL_E("Fail to set factoryOTA property"); - } } } else { NXPLOG_NCIHAL_E("Fail to get FactoryOTA mode status"); |