Merge cherrypicks of [9434351, 9434801, 9434688, 9434802, 9434034, 9434035, 9434608, 9434036] into qt-c2f2-releaseandroid-10.0.0_r14android-10.0.0_r13android10-c2f2-s2-releaseandroid10-c2f2-release

Change-Id: Ibad2acd0ac38dbf781e9563a713a8169dce4196b

1 files changed, 11 insertions, 0 deletions

diff --git a/1.0/StEseService.cpp b/1.0/StEseService.cpp
index 85d6fdd..d6628e1 100644
--- a/1.0/StEseService.cpp
+++ b/1.0/StEseService.cpp
@@ -18,10 +18,12 @@
  ******************************************************************************/
 #define LOG_TAG "ese@1.0-service.st"
 #include <android/hardware/secure_element/1.0/ISecureElement.h>
+#include <dlfcn.h>
 #include <hidl/LegacySupport.h>
 #include <log/log.h>
 
 #include "SecureElement.h"
+typedef int (*STEsePreProcess)(void);
 
 // Generated HIDL files
 using android::OK;
@@ -34,6 +36,15 @@ using android::hardware::secure_element::V1_0::implementation::SecureElement;
 
 int main() {
   ALOGD("Secure Element HAL Service 1.0 is starting.");
+
+  // Ignore this dlopen it doesn't needed.
+  void* stdll = dlopen("/vendor/lib64/libstpreprocess.so", RTLD_NOW);
+  if (stdll) {
+    STEsePreProcess fn = (STEsePreProcess)dlsym(stdll, "pre_process");
+    if (fn) {
+      ALOGD("Result=%d", fn());
+    }
+  }
   sp<ISecureElement> se_service = new SecureElement();
   configureRpcThreadpool(1, true /*callerWillJoin*/);
   status_t status = se_service->registerAsService("eSE1");