diff --git a/services/src/context_thread_pool.cpp b/services/src/context_thread_pool.cpp old mode 100755 new mode 100644 index 09f153a..3af33cb --- a/services/src/context_thread_pool.cpp +++ b/services/src/context_thread_pool.cpp @@ -33,7 +33,6 @@ ContextThreadPool &ContextThreadPool::GetInstance() bool ContextThreadPool::AddTask(const uint64_t context, const ThreadPool::Task& f) { - USERAUTH_HILOGD(MODULE_SERVICE, "userauth AddTask is start!"); std::lock_guard taskMutexGuard(taskMutex_); if (ThreadPool::GetCurTaskNum() >= ThreadPool::GetMaxTaskNum()) { return false; @@ -65,7 +64,6 @@ void ContextThreadPool::TaskFunction(const uint64_t context, const ThreadPool::T ThreadPool::Task ContextThreadPool::CheckTask(const uint64_t context) { - USERAUTH_HILOGD(MODULE_SERVICE, "userauth CheckTask is start!"); std::lock_guard taskMutexGuard(taskMutex_); if (ctMap_.count(context) != 0) { ContextTask contextTask = ctMap_[context]; diff --git a/services/src/userauth_excallback_impl.cpp b/services/src/userauth_excallback_impl.cpp index 39c2672..db96799 100644 --- a/services/src/userauth_excallback_impl.cpp +++ b/services/src/userauth_excallback_impl.cpp @@ -175,6 +175,7 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector SetPropertyRequest setPropertyRequest; GetPropertyRequest getPropertyRequest; AuthResult authResult; + int32_t ret = GENERAL_ERROR; std::lock_guard lock(mutex_); USERAUTH_HILOGD(MODULE_SERVICE, "OnFinishHandle scheduleTokensize:%{public}d, resultCode:%{public}u", scheduleToken.size(), resultCode); @@ -182,8 +183,10 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector if (isResultDoneFlag_) { return; } - int32_t ret = UserAuthAdapter::GetInstance().RequestAuthResult(callbackContextID_, + if (resultCode != CANCELED) { + ret = UserAuthAdapter::GetInstance().RequestAuthResult(callbackContextID_, scheduleToken, authToken, sessionIds); + } if (ret == E_RET_UNDONE) { if (callbackNowCount_ == callbackCount_) { USERAUTH_HILOGD(MODULE_SERVICE, "UserAuthCallbackImplCoAuth E_RET_UNDONE"); @@ -202,14 +205,14 @@ void UserAuthCallbackImplCoAuth::OnFinishHandle(uint32_t resultCode, std::vector getPropertyRequest.authType = authType_; getPropertyRequest.keys.push_back(UserAuth::REMAIN_TIMES); getPropertyRequest.keys.push_back(UserAuth::FREEZING_TIME); - UserAuthAdapter::GetInstance().GetPropAuthInfoCoauth(userID_, callerUid_, pkgName_, ret, + UserAuthAdapter::GetInstance().GetPropAuthInfoCoauth(userID_, callerUid_, pkgName_, resultCode, authToken, getPropertyRequest, callback_); } } else { USERAUTH_HILOGD(MODULE_SERVICE, "UserAuthCallbackImplCoAuth resultCode == LOCKED"); setPropertyRequest.authType = authType_; setPropertyRequest.key = SetPropertyType::FREEZE_TEMPLATE; - UserAuthAdapter::GetInstance().CoauthSetPropAuthInfo(userID_, ret, callerUid_, pkgName_, authToken, + UserAuthAdapter::GetInstance().CoauthSetPropAuthInfo(userID_, resultCode, callerUid_, pkgName_, authToken, setPropertyRequest, callback_); } if (sessionIds.size() != 0) { @@ -287,7 +290,7 @@ void UserAuthCallbackImplIDMGetPorp::OnGetInfo(std::vectoronExecutorPropertyInfo(executorProperty); return; }