summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2017-12-20 20:07:16 (GMT)
committerMichael Bestas <mkbestas@lineageos.org>2019-01-03 22:10:26 (GMT)
commitbb6dfecc050a8a4d3efa96162f01c7530ca68de8 (patch)
treec6db7f3eb1cd033ef1dd65ade9a73dda7f2bc00f
parent83ec2af13a970695390b5a582692910d71ebf0b5 (diff)
downloadandroid_vendor_qcom_opensource_cryptfs_hw-bb6dfecc050a8a4d3efa96162f01c7530ca68de8.zip
android_vendor_qcom_opensource_cryptfs_hw-bb6dfecc050a8a4d3efa96162f01c7530ca68de8.tar.gz
android_vendor_qcom_opensource_cryptfs_hw-bb6dfecc050a8a4d3efa96162f01c7530ca68de8.tar.bz2
cryptfs_hw: Featurize support for waiting on QSEE to startrefs/changes/29/226129/10
* Match keymaster change to support older blobs Change-Id: I2d45fe60e0f4bf076d064d6c432740af0b3c840c
-rw-r--r--Android.bp3
-rw-r--r--cryptfs_hw.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index 12e2aa6..ea6cbb0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,9 @@ cc_library_shared {
product_variables: {
lineage: {
+ should_skip_waiting_for_qsee: {
+ cflags: ["-DSKIP_WAITING_FOR_QSEE"],
+ },
supports_legacy_hw_fde: {
cflags: ["-DLEGACY_HW_DISK_ENCRYPTION"],
},
diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index 36d5d48..42bf4c4 100644
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -97,6 +97,12 @@ static inline void* secure_memset(void* v, int c , size_t n)
}
#ifdef LEGACY_HW_DISK_ENCRYPTION
+#ifdef SKIP_WAITING_FOR_QSEE
+static int is_qseecom_up()
+{
+ return 1;
+}
+#else
static int is_qseecom_up()
{
int i = 0;
@@ -110,6 +116,7 @@ static int is_qseecom_up()
}
return 0;
}
+#endif
static int load_qseecom_library()
{