summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2019-10-18 18:55:50 (GMT)
committerMichael Bestas <mkbestas@lineageos.org>2019-10-18 18:55:50 (GMT)
commitbcf7e6150222b94fe394ed9440cd1a7db4d3e5ef (patch)
tree2608adde5c156f9e2c1185160b7d58b73493cb9e
parent3aab8331acf265223032c2021e7bc2deac46794b (diff)
parentcd4b1314ed710187d6f9ab8dea0cbe8a92685929 (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-bcf7e6150222b94fe394ed9440cd1a7db4d3e5ef.zip
android_vendor_qcom_opensource_cryptfs_hw-bcf7e6150222b94fe394ed9440cd1a7db4d3e5ef.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-bcf7e6150222b94fe394ed9440cd1a7db4d3e5ef.tar.bz2
Merge tag 'LA.UM.8.1.r1-09500-sm8150.0' of https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/cryptfs_hw into lineage-17.0refs/changes/17/261917/2
"LA.UM.8.1.r1-09500-sm8150.0" Change-Id: I1b604721ef5eed2103e390f5bdc967fc58387360
-rw-r--r--cryptfs_hw.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/cryptfs_hw.cpp b/cryptfs_hw.cpp
index 5d233b9..c1d42c9 100644
--- a/cryptfs_hw.cpp
+++ b/cryptfs_hw.cpp
@@ -34,7 +34,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <linux/qseecom.h>
#include "cutils/log.h"
#include "cutils/properties.h"
#include <hardware/hardware.h>
@@ -50,7 +49,6 @@ using ::android::hardware::Void;
#define QTI_ICE_STORAGE_UFS 1
#define QTI_ICE_STORAGE_SDCC 2
-#ifdef QSEECOM_IOCTL_SET_ICE_INFO
int set_ice_param(int flag)
{
int rc = -1;
@@ -62,12 +60,6 @@ int set_ice_param(int flag)
rc = cryptfshwService->setIceParam(flag);
return rc;
}
-#else
-int set_ice_param(int flag)
-{
- return -1;
-}
-#endif
int set_hw_device_encryption_key(const char* passwd, const char* enc_mode)
{