summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-19 01:24:51 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-19 01:24:51 +0000
commit4d582ef92f3e6b78b7c1af2abd767b34ae4ff17f (patch)
treee48e038159603ef7af006d81d9e3b0d5e315e3c4
parente7335b7ee0562d32c37e832172d3fade1271d2cf (diff)
parent58916583ef12febd8768fe7b9942e47f34be046f (diff)
downloadkeymint-4d582ef92f3e6b78b7c1af2abd767b34ae4ff17f.tar.gz
Snap for 10970117 from 58916583ef12febd8768fe7b9942e47f34be046f to 24Q1-release
Change-Id: I6d7d7b2851bc7baf5926917304948b8f540fcd93
-rw-r--r--Android.bp1
-rw-r--r--transport/OmapiTransport.cpp5
2 files changed, 0 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index a9d1219..660dba3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -122,7 +122,6 @@ cc_library {
"libcutils",
"libutils",
"libhardware",
- "libhardware_legacy",
"libhidlbase",
"libbinder_ndk",
],
diff --git a/transport/OmapiTransport.cpp b/transport/OmapiTransport.cpp
index 66a313c..2673308 100644
--- a/transport/OmapiTransport.cpp
+++ b/transport/OmapiTransport.cpp
@@ -45,7 +45,6 @@
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
-#include <hardware_legacy/power.h>
#include "OmapiTransport.h"
@@ -59,8 +58,6 @@
#endif
namespace keymint::javacard {
-const char *kWakelock = "nxp_keymint_session";
-
class SEListener : public ::aidl::android::se::omapi::BnSecureElementListener {};
#ifdef NXP_EXTNS
@@ -69,7 +66,6 @@ void omapiSessionTimerFunc(union sigval arg){
OmapiTransport *obj = (OmapiTransport*)arg.sival_ptr;
if(obj != nullptr)
obj->closeChannel();
- release_wake_lock(kWakelock);
}
void OmapiTransport::BinderDiedCallback(void *cookie) {
@@ -389,7 +385,6 @@ bool OmapiTransport::internalProtectedTransmitApdu(
(getApduStatus(transmitResponse) == RESP_CHANNEL_NOT_AVAILABLE))) {
closeChannel(); // close immediately
} else {
- acquire_wake_lock(PARTIAL_WAKE_LOCK, kWakelock);
LOGD_OMAPI("Set the timer with timeout " << timeout << " ms");
mTimer.set(timeout, this, omapiSessionTimerFunc);
}