summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-09-21 16:33:14 (GMT)
committerLinux Build Service Account <lnxbuild@localhost>2019-09-21 16:33:14 (GMT)
commitcd4b1314ed710187d6f9ab8dea0cbe8a92685929 (patch)
tree27b54d55ef919191b356ed51064fad808fccfbaf
parent62487cf737babc6499925f91ae68a31af902c197 (diff)
parent698b0fc5e6e8842390d46433861e5db838ab2c62 (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-cd4b1314ed710187d6f9ab8dea0cbe8a92685929.zip
android_vendor_qcom_opensource_cryptfs_hw-cd4b1314ed710187d6f9ab8dea0cbe8a92685929.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-cd4b1314ed710187d6f9ab8dea0cbe8a92685929.tar.bz2
Merge 698b0fc5e6e8842390d46433861e5db838ab2c62 on remote branch
Change-Id: I01c223b1bfcc90b2d9eb4a3de9eab425ecb8e6c1
-rw-r--r--cryptfs_hw.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/cryptfs_hw.cpp b/cryptfs_hw.cpp
index 2d9af7a..6cd634d 100644
--- a/cryptfs_hw.cpp
+++ b/cryptfs_hw.cpp
@@ -32,7 +32,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
-#include <linux/qseecom.h>
#include "cutils/log.h"
#include "cutils/properties.h"
#include "cryptfs_hw.h"
@@ -46,7 +45,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;
@@ -58,12 +56,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)
{