diff options
author | anil.hiranniah <anil.hiranniah@nxp.com> | 2022-03-09 09:40:01 +0530 |
---|---|---|
committer | anil.hiranniah <anil.hiranniah@nxp.com> | 2022-03-09 09:40:01 +0530 |
commit | 2cae22d09b68fce9dfc774d3d7de0c0316110925 (patch) | |
tree | ccfea20014d30b8f8d84838b7a1d15e635b0cccb | |
parent | 187ae69e7200b9e87438a3a7dbd63d91179773d9 (diff) | |
download | secure_element-2cae22d09b68fce9dfc774d3d7de0c0316110925.tar.gz |
Fix for SE Hal compilation issue for service
"android.hardware.secure_element_snxxx@1.1-service"
Bug: 210582278
Test: build pass with SE HAL 1.1 version
Change-Id: Ibcd2c89764dcf7733456db0f91eba6ecc4225331
-rwxr-xr-x | snxxx/1.1/NxpEseService.cpp | 17 | ||||
-rwxr-xr-x | snxxx/1.1/SecureElement.cpp | 6 | ||||
-rwxr-xr-x | snxxx/1.1/VirtualISO.cpp | 6 |
3 files changed, 27 insertions, 2 deletions
diff --git a/snxxx/1.1/NxpEseService.cpp b/snxxx/1.1/NxpEseService.cpp index 3d23bb4..8b0b215 100755 --- a/snxxx/1.1/NxpEseService.cpp +++ b/snxxx/1.1/NxpEseService.cpp @@ -27,7 +27,9 @@ #include "NxpEse.h" #include "SecureElement.h" #include "VirtualISO.h" +#ifdef NXP_BOOTTIME_UPDATE #include "eSEClient.h" +#endif // Generated HIDL files using android::OK; @@ -65,9 +67,12 @@ int main() { goto shutdown; } configureRpcThreadpool(1, true /*callerWillJoin*/); - +#ifdef NXP_BOOTTIME_UPDATE checkEseClientUpdate(); ret = geteSETerminalId(terminalID); +#else + ret = true; +#endif ALOGI("Terminal val = %s", terminalID); if ((ret) && (strncmp(SEterminal, terminalID, 3) == 0)) { ALOGI("Terminal ID found"); @@ -98,14 +103,19 @@ int main() { } ALOGI("Secure Element Service is ready"); } - +#ifdef NXP_VISO_ENABLE ALOGI("Virtual ISO HAL Service 1.0 is starting."); virtual_iso_service = new VirtualISO(); if (virtual_iso_service == nullptr) { ALOGE("Can not create an instance of Virtual ISO HAL Iface, exiting."); goto shutdown; } +#ifdef NXP_BOOTTIME_UPDATE ret = geteUICCTerminalId(terminalID); +#else + strncpy(terminalID, "eSE2", 4); + ret = true; +#endif if ((ret) && (strncmp(SEterminal, terminalID, 3) == 0)) { status = virtual_iso_service->registerAsService(terminalID); if (status != OK) { @@ -116,7 +126,10 @@ int main() { } ALOGI("Virtual ISO: Secure Element Service is ready"); +#endif +#ifdef NXP_BOOTTIME_UPDATE perform_eSEClientUpdate(); +#endif joinRpcThreadpool(); } catch (const std::length_error& e) { ALOGE("Length Exception occurred = %s ", e.what()); diff --git a/snxxx/1.1/SecureElement.cpp b/snxxx/1.1/SecureElement.cpp index 3a2834c..991add7 100755 --- a/snxxx/1.1/SecureElement.cpp +++ b/snxxx/1.1/SecureElement.cpp @@ -21,7 +21,9 @@ #include <android-base/stringprintf.h> #include "NxpEse.h" +#ifdef NXP_BOOTTIME_UPDATE #include "eSEClient.h" +#endif #include "hal_nxpese.h" #include "phNxpEse_Apdu_Api.h" #include "phNxpEse_Api.h" @@ -80,6 +82,7 @@ Return<void> SecureElement::init( clientCallback->linkToDeath(this, 0 /*cookie*/); } LOG(INFO) << "SecureElement::init called here"; +#ifdef NXP_BOOTTIME_UPDATE if (ese_update != ESE_UPDATE_COMPLETED) { mCallbackV1_0 = clientCallback; clientCallback->onStateChange(false); @@ -88,6 +91,7 @@ Return<void> SecureElement::init( return Void(); // Register } +#endif if (mIsEseInitialized) { clientCallback->onStateChange(true); return Void(); @@ -137,6 +141,7 @@ Return<void> SecureElement::init_1_1( clientCallback->linkToDeath(this, 0 /*cookie*/); } LOG(INFO) << "SecureElement::init called here"; +#ifdef NXP_BOOTTIME_UPDATE if (ese_update != ESE_UPDATE_COMPLETED) { mCallbackV1_1 = clientCallback; clientCallback->onStateChange_1_1(false, "NXP SE update going on"); @@ -145,6 +150,7 @@ Return<void> SecureElement::init_1_1( return Void(); // Register } +#endif if (mIsEseInitialized) { clientCallback->onStateChange_1_1(true, "NXP SE HAL init ok"); return Void(); diff --git a/snxxx/1.1/VirtualISO.cpp b/snxxx/1.1/VirtualISO.cpp index 432de16..6b0748a 100755 --- a/snxxx/1.1/VirtualISO.cpp +++ b/snxxx/1.1/VirtualISO.cpp @@ -21,7 +21,9 @@ #include "NxpEse.h" #include "SecureElement.h" +#ifdef NXP_BOOTTIME_UPDATE #include "eSEClient.h" +#endif #include "hal_nxpese.h" #include "phNxpEse_Apdu_Api.h" #include "phNxpEse_Api.h" @@ -75,6 +77,7 @@ Return<void> VirtualISO::init( } else { clientCallback->linkToDeath(this, 0 /*cookie*/); } +#ifdef NXP_BOOTTIME_UPDATE if (ese_update != ESE_UPDATE_COMPLETED) { mCallbackV1_0 = clientCallback; clientCallback->onStateChange(false); @@ -83,6 +86,7 @@ Return<void> VirtualISO::init( return Void(); // Register } +#endif if (mIsEseInitialized) { clientCallback->onStateChange(true); return Void(); @@ -130,6 +134,7 @@ Return<void> VirtualISO::init_1_1( } else { clientCallback->linkToDeath(this, 0 /*cookie*/); } +#ifdef NXP_BOOTTIME_UPDATE if (ese_update != ESE_UPDATE_COMPLETED) { mCallbackV1_1 = clientCallback; clientCallback->onStateChange_1_1(false, "NXP SE update going on"); @@ -138,6 +143,7 @@ Return<void> VirtualISO::init_1_1( return Void(); // Register } +#endif if (mIsEseInitialized) { clientCallback->onStateChange_1_1(true, "NXP VISIO HAL init ok"); return Void(); |