Read property only for eSE1 am: ab466ddea2 am: 6b4c97b790 am: 178912405c
Original change: https://android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/2064213
Change-Id: I36ea53b94ab4564ac86ebce8a120fb1fcb2578db
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/secure_element/1.2/SecureElement.cpp b/secure_element/1.2/SecureElement.cpp
index 74609ae..1c246bc 100644
--- a/secure_element/1.2/SecureElement.cpp
+++ b/secure_element/1.2/SecureElement.cpp
@@ -775,11 +775,14 @@
SecureElement::reset() {
SecureElementStatus status = SecureElementStatus::FAILED;
- std::string valueStr = android::base::GetProperty("persist.vendor.se.streset", "");
+ std::string eSE1ResetToolStr;
int ret = 0;
ALOGD("SecureElement:%s start", __func__);
+ if (strncmp(ese_flag_name, "eSE1", 4) == 0) {
+ eSE1ResetToolStr = android::base::GetProperty("persist.vendor.se.streset", "");
+ }
if (deinitializeSE() != SecureElementStatus::SUCCESS) {
ALOGE("SecureElement:%s deinitializeSE Failed", __func__);
}
@@ -790,10 +793,10 @@
internalClientCallback->onStateChange(false);
}
- if (strncmp(ese_flag_name, "eSE1", 4) == 0 && valueStr.length() > 0) {
+ if (eSE1ResetToolStr.length() > 0) {
typedef int (*STEseReset)();
- valueStr = VENDOR_LIB_PATH + valueStr + VENDOR_LIB_EXT;
- void *stdll = dlopen(valueStr.c_str(), RTLD_NOW);
+ eSE1ResetToolStr = VENDOR_LIB_PATH + eSE1ResetToolStr + VENDOR_LIB_EXT;
+ void *stdll = dlopen(eSE1ResetToolStr.c_str(), RTLD_NOW);
STEseReset fn = (STEseReset)dlsym(stdll, "direct_reset");
ret = fn();
