diff options
| author | dianlujitao <dianlujitao@lineageos.org> | 2019-10-08 14:52:16 +0800 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 20:03:40 +0200 |
| commit | cfa17ea7b26995d3c7719b1c1476ea1d56306186 (patch) | |
| tree | 2da45ea47ab550ebeb3c90763070b79a1a18c4cd | |
| parent | e6928d5b91da56bb5332ffda43f9e4b056b73ad0 (diff) | |
| download | android_hardware_qcom_keymaster-staging/lineage-17.0_merge-android-10.0.0_r9.tar.gz android_hardware_qcom_keymaster-staging/lineage-17.0_merge-android-10.0.0_r9.tar.bz2 android_hardware_qcom_keymaster-staging/lineage-17.0_merge-android-10.0.0_r9.zip | |
keymaster: Reverse wait for qsee flagstaging/lineage-17.0_merge-android-10.0.0_r9lineage-17.1
Change-Id: I67ef319040a51315529ad24007a377a143e59622
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | keymaster_qcom.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -15,8 +15,8 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8084) 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) 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 @@ static int qcom_km_open(const hw_module_t* module, const char* name, { 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 @@ static int qcom_km_open(const hw_module_t* module, const char* name, 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) |