commit cfa17ea7b26995d3c7719b1c1476ea1d56306186
author dianlujitao <dianlujitao@lineageos.org> Tue Oct 08 14:52:16 2019 +0800
committer Michael Bestas <mkbestas@lineageos.org> Wed Dec 11 20:03:40 2019 +0200
tree 2da45ea47ab550ebeb3c90763070b79a1a18c4cd
parent e6928d5b91da56bb5332ffda43f9e4b056b73ad0

keymaster: Reverse wait for qsee flag

Change-Id: I67ef319040a51315529ad24007a377a143e59622

Android.mk

diff --git a/Android.mk b/Android.mk
index 9a3b7f2..0ee9852 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,8 +15,8 @@
 keymaster-def += -D_ION_HEAP_MASK_COMPATIBILITY_WA
 endif
 endif
-ifeq ($(TARGET_KEYMASTER_SKIP_WAITING_FOR_QSEE),true)
-keymaster-def += -DSKIP_WAITING_FOR_QSEE
+ifeq ($(TARGET_KEYMASTER_WAIT_FOR_QSEE),true)
+keymaster-def += -DWAIT_FOR_QSEE
 endif
 
 include $(CLEAR_VARS)

keymaster_qcom.cpp

diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp
index 2dd26e0..3c0f7b5 100644
--- a/keymaster_qcom.cpp
+++ b/keymaster_qcom.cpp
@@ -742,7 +742,7 @@
 {
     int ret = 0;
     unsigned int attempt_num = 0;
-#ifndef SKIP_WAITING_FOR_QSEE
+#ifdef WAIT_FOR_QSEE
     char property_val[PROPERTY_VALUE_MAX] = {0};
 #endif
     qcom_keymaster_handle_t* km_handle;
@@ -769,14 +769,14 @@
     dev->context = (void *)km_handle;
     while (attempt_num < MAX_PROPERTY_GET_ATTEMPTS)
     {
-#ifndef SKIP_WAITING_FOR_QSEE
+#ifdef WAIT_FOR_QSEE
         property_get("sys.keymaster.loaded", property_val, "");
         if (strncmp(property_val, "true", sizeof(property_val)) == 0)
         {
 #endif
             ALOGD("keymaster app is loaded");
             break;
-#ifndef SKIP_WAITING_FOR_QSEE
+#ifdef WAIT_FOR_QSEE
         }
 #endif
         if (attempt_num == 0)