From 941a363c5a6aebddc3fb916f1460504160d9b132 Mon Sep 17 00:00:00 2001 From: LoveSy Date: Sat, 18 May 2024 13:55:33 +0800 Subject: [PATCH] Support waiting on non-exist prop --- native/src/core/resetprop/resetprop.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/native/src/core/resetprop/resetprop.cpp b/native/src/core/resetprop/resetprop.cpp index 74e1507cd..b39c07e90 100644 --- a/native/src/core/resetprop/resetprop.cpp +++ b/native/src/core/resetprop/resetprop.cpp @@ -226,20 +226,23 @@ template static StringType wait_prop(const char *name, const char *old_value) { if (!check_legal_property_name(name)) return {}; - auto pi = system_property_find(name); - if (!pi) { - LOGD("resetprop: prop [%s] does not exist\n", name); - return {}; + + const prop_info *pi; + auto serial = __system_property_area_serial(); + while (!(pi = system_property_find(name))) { + LOGD("resetprop: waiting for prop [%s] to exist\n", name); + system_property_wait(nullptr, serial, &serial, nullptr); } prop_to_string cb; read_prop_with_cb(pi, &cb); - if (old_value == nullptr || cb.val == old_value) { + while (old_value == nullptr || cb.val == old_value) { LOGD("resetprop: waiting for prop [%s]\n", name); uint32_t new_serial; system_property_wait(pi, cb.serial, &new_serial, nullptr); read_prop_with_cb(pi, &cb); + if (old_value == nullptr) break; } LOGD("resetprop: get prop [%s]: [%s]\n", name, cb.val.c_str());