From 36faecb2e798d4642b9605a9493269f56ff0bd61 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Wed, 2 Mar 2022 21:02:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E6=94=B9wagner=20rese?= =?UTF-8?q?t=E6=8C=89=E9=94=AE=E9=87=8D=E5=90=AF=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index e5679e6a..e1248973 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -67,7 +67,7 @@ constexpr int32_t WAIT_DELAY_US = 100 * 1000; // 100ms constexpr int32_t GID_USER_DATA_RW = 1008; constexpr int32_t MAX_GIDS = 64; constexpr int32_t UID_BASE = 200000; -constexpr int32_t WAIT_PARAM_TIME = 1000; +constexpr int32_t WAIT_PARAM_TIME = 5; constexpr std::string_view BUNDLE_NAME_MEDIA_LIBRARY("com.ohos.medialibrary.MediaLibraryDataA"); constexpr std::string_view BUNDLE_NAME_SCANNER("com.ohos.medialibrary.MediaScannerAbilityA"); @@ -171,12 +171,20 @@ void AppSpawnServer::WaitRebootEvent() { APPSPAWN_LOGI("wait 'startup.device.ctl' event"); while (isRunning_) { - int ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); + int ret = WaitParameter("startup.device.ctl", "stop", WAIT_PARAM_TIME); if (ret == 0) { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); break; + } else { + std::string value = OHOS::system::GetParameter("startup.device.ctl", ""); + if (ret == 0 && value == "stop") { + std::lock_guard lock(mut_); + isStop_ = true; + dataCond_.notify_one(); + break; + } } } } -- Gitee From 0c0db9ae90faf37d978d6e08681a1eaf58a7fbc5 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Wed, 2 Mar 2022 21:26:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E6=94=B9wagner=20rese?= =?UTF-8?q?t=E6=8C=89=E9=94=AE=E9=87=8D=E5=90=AF=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index e1248973..78d936b3 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -179,7 +179,7 @@ void AppSpawnServer::WaitRebootEvent() break; } else { std::string value = OHOS::system::GetParameter("startup.device.ctl", ""); - if (ret == 0 && value == "stop") { + if (value == "stop") { std::lock_guard lock(mut_); isStop_ = true; dataCond_.notify_one(); -- Gitee From c64217e90b879fe8646d5311f34353b33afe7c12 Mon Sep 17 00:00:00 2001 From: xionglei6 Date: Wed, 2 Mar 2022 21:56:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3reset=E6=97=B6?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xionglei6 --- src/appspawn_server.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp index 78d936b3..7597f058 100644 --- a/src/appspawn_server.cpp +++ b/src/appspawn_server.cpp @@ -40,6 +40,7 @@ #include "system_ability_definition.h" #include "token_setproc.h" #include "parameter.h" +#include "parameters.h" #include "beget_ext.h" #ifdef WITH_SELINUX #include "hap_restorecon.h" -- Gitee