commit e4e558ef7efed43df0a78f27d737fd4fee43aba1
author Michael Bestas <mkbestas@lineageos.org> Wed Dec 20 22:07:16 2017 +0200
committer Vaughn N <rwaterspf1@floydco.net> Wed Dec 12 11:19:57 2018 -0500
tree b112eb3d009847c8063893ee9796cb82d16b069e
parent 5978a5e46adfe5630f4d964dce5174b89bcf6d4a

cryptfs_hw: Featureize support for waiting on QSEE to start

* Match keymaster change to support older blobs

Change-Id: I2d45fe60e0f4bf076d064d6c432740af0b3c840c
Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 3ed44f6..768e874 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,6 +21,9 @@
             device_support_legacy_hwfde: {
                 cflags: ["-DLEGACY_HW_DISK_ENCRYPTION"],
             },
+            device_support_wait_for_qsee: {
+                cflags: ["-DWAIT_FOR_QSEE"],
+            },
         },
     },
 

cryptfs_hw.c

diff --git a/cryptfs_hw.c b/cryptfs_hw.c
index e231759..6a3a5b1 100644
--- a/cryptfs_hw.c
+++ b/cryptfs_hw.c
@@ -373,6 +373,7 @@
     return tmp_passwd;
 }
 
+#ifdef WAIT_FOR_QSEE
 int is_qseecom_up()
 {
     int i = 0;
@@ -390,6 +391,12 @@
     }
     return 0;
 }
+#else
+int is_qseecom_up()
+{
+    return 1;
+}
+#endif
 
 /*
  * For NON-ICE targets, it would return 0 on success. On ICE based targets,