openharmony/account_os_account
1
0
Fork 0
mirror of https://gitee.com/openharmony/account_os_account synced 2025-02-18 19:17:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert dely kill

Browse Source 
Signed-off-by: yeyuning <yeyuning2@huawei.com>
Change-Id: I39e138dfb59c02584a3db94ee6e0f37ad622f9a0
This commit is contained in:
yeyuning 2024-10-18 15:32:21 +08:00
parent d93f36f44f
commit dbc9a3530b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/accountmgr/src/osaccount/inner_os_account_manager.cpp
View File

@ -58,6 +58,9 @@ constexpr int32_t DELAY_FOR_EXCEPTION = 50;
constexpr int32_t MAX_RETRY_TIMES = 50;
constexpr int32_t MAX_PRIVATE_TYPE_NUMBER = 1;
constexpr int32_t DELAY_FOR_REMOVING_FOREGROUND_OS_ACCOUNT = 1500;
#ifdef ENABLE_MULTIPLE_ACTIVE_ACCOUNTS
constexpr int32_t DELAY_FOR_DEACTIVATE_OS_ACCOUNT = 3000;
#endif
}
IInnerOsAccountManager::IInnerOsAccountManager() : subscribeManager_(OsAccountSubscribeManager::GetInstance()),
@ -2258,15 +2261,14 @@ ErrCode IInnerOsAccountManager::UpdateAccountToForeground(const uint64_t display
ErrCode IInnerOsAccountManager::UpdateAccountToBackground(int32_t oldId)
{
OsAccountInfo oldOsAccountInfo;
bool isNeedDelay = false;
{
std::lock_guard<std::mutex> lock(*GetOrInsertUpdateLock(oldId));
ErrCode errCode = osAccountControl_->GetOsAccountInfoById(oldId, oldOsAccountInfo);
if (errCode != ERR_OK) {
return ERR_ACCOUNT_COMMON_ACCOUNT_NOT_EXIST_ERROR;
}
if (oldOsAccountInfo.GetIsForeground()) {
std::this_thread::sleep_for(std::chrono::milliseconds(DELAY_FOR_REMOVING_FOREGROUND_OS_ACCOUNT));
}
isNeedDelay = oldOsAccountInfo.GetIsForeground();
oldOsAccountInfo.SetIsForeground(false);
oldOsAccountInfo.SetDisplayId(Constants::INVALID_DISPALY_ID);
errCode = osAccountControl_->UpdateOsAccount(oldOsAccountInfo);
@ -2287,6 +2289,9 @@ ErrCode IInnerOsAccountManager::UpdateAccountToBackground(int32_t oldId)
#endif
bool isLoggedIn = false;
if ((oldOsAccountInfo.GetType() != OsAccountType::PRIVATE) && (!loggedInAccounts_.Find(oldId, isLoggedIn))) {
if (isNeedDelay) {
std::this_thread::sleep_for(std::chrono::milliseconds(DELAY_FOR_DEACTIVATE_OS_ACCOUNT));
}
DeactivateOsAccount(oldId, false);
}
#else