openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-27 03:11:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

mingxihua@huawei.com.cn

Browse Source 
Signed-off-by: m00512953 <mingxihua@huawei.com>
This commit is contained in:
m00512953
2022-08-11 14:44:16 +08:00
parent a398221bb3
commit 1a3df58968
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/src/connection_state_manager.cpp
+3 -3
View File
@@ -134,7 +134,7 @@ void ConnectionStateManager::RemoveConnection(const std::shared_ptr<ConnectionRe
void ConnectionStateManager::AddDataAbilityConnection(const DataAbilityCaller &caller,
const std::shared_ptr<DataAbilityRecord> &record)
{
if (!CheckAddAndRemoveDataAbilityConnection(caller, record)) {
if (!CheckDataAbilityConnectionParams(caller, record)) {
return;
}
@@ -149,7 +149,7 @@ void ConnectionStateManager::AddDataAbilityConnection(const DataAbilityCaller &c
void ConnectionStateManager::RemoveDataAbilityConnection(const DataAbilityCaller &caller,
const std::shared_ptr<DataAbilityRecord> &record)
{
if (!CheckAddAndRemoveDataAbilityConnection(caller, record)) {
if (!CheckDataAbilityConnectionParams(caller, record)) {
return;
}
@@ -161,7 +161,7 @@ void ConnectionStateManager::RemoveDataAbilityConnection(const DataAbilityCaller
observerController_->NotifyExtensionDisconnected(connectionData);
}
bool ConnectionStateManager::CheckAddAndRemoveDataAbilityConnection(const DataAbilityCaller &caller,
bool ConnectionStateManager::CheckDataAbilityConnectionParams(const DataAbilityCaller &caller,
const std::shared_ptr<DataAbilityRecord> &record) const
{
if (!observerController_) {
services/appmgr/include/app_state_observer_manager.h
+3 -3
View File
@@ -48,9 +48,9 @@ public:
private:
void HandleAppStateChanged(const std::shared_ptr<AppRunningRecord> &appRecord, const ApplicationState state);
void HandleStateChangedNotifyObserver(const AbilityStateData abilityStateData, bool isAbility);
void HandleOnProcessCreated(const std::shared_ptr<AppRunningRecord> &appRecord);
void HandleOnAppProcessCreated(const std::shared_ptr<AppRunningRecord> &appRecord);
void HandleOnRenderProcessCreated(const std::shared_ptr<RenderRecord> &RenderRecord);
void HandleOnProcessDied(const std::shared_ptr<AppRunningRecord> &appRecord);
void HandleOnAppProcessDied(const std::shared_ptr<AppRunningRecord> &appRecord);
void HandleOnRenderProcessDied(const std::shared_ptr<RenderRecord> &RenderRecord);
bool ObserverExist(const sptr<IApplicationStateObserver> &observer);
void AddObserverDeathRecipient(const sptr<IApplicationStateObserver> &observer);
@@ -60,7 +60,7 @@ private:
void OnObserverDied(const wptr<IRemoteObject> &remote);
AppStateData WrapAppStateData(const std::shared_ptr<AppRunningRecord> &appRecord,
const ApplicationState state);
void HandleOnProcessCreatedCommon(const ProcessData &data);
void HandleOnProcessCreated(const ProcessData &data);
void HandleOnProcessDiedCommon(const ProcessData &data);
private:
services/appmgr/src/app_state_observer_manager.cpp
+10 -10
View File
@@ -115,7 +115,7 @@ void AppStateObserverManager::OnProcessDied(const std::shared_ptr<AppRunningReco
return;
}
HILOG_INFO("OnProcessDied come.");
self->HandleOnProcessDied(appRecord);
self->HandleOnAppProcessDied(appRecord);
};
handler_->PostTask(task);
}
@@ -143,7 +143,7 @@ void AppStateObserverManager::OnProcessCreated(const std::shared_ptr<AppRunningR
return;
}
HILOG_INFO("OnProcessCreated come.");
self->HandleOnProcessCreated(appRecord);
self->HandleOnAppProcessCreated(appRecord);
};
handler_->PostTask(task);
}
@@ -229,7 +229,7 @@ void AppStateObserverManager::HandleStateChangedNotifyObserver(const AbilityStat
}
}
void AppStateObserverManager::HandleOnProcessCreated(const std::shared_ptr<AppRunningRecord> &appRecord)
void AppStateObserverManager::HandleOnAppProcessCreated(const std::shared_ptr<AppRunningRecord> &appRecord)
{
if (!appRecord) {
HILOG_ERROR("app record is null");
@@ -238,7 +238,7 @@ void AppStateObserverManager::HandleOnProcessCreated(const std::shared_ptr<AppRu
ProcessData data = WrapProcessData(appRecord);
HILOG_DEBUG("Process Create, bundle:%{public}s, pid:%{public}d, uid:%{public}d, size:%{public}d",
data.bundleName.c_str(), data.pid, data.uid, (int32_t)appStateObserverMap_.size());
HandleOnProcessCreatedCommon(data);
HandleOnProcessCreated(data);
}
void AppStateObserverManager::HandleOnRenderProcessCreated(const std::shared_ptr<RenderRecord> &renderRecord)
@@ -250,10 +250,10 @@ void AppStateObserverManager::HandleOnRenderProcessCreated(const std::shared_ptr
ProcessData data = WrapRenderProcessData(renderRecord);
HILOG_DEBUG("RenderProcess Create, bundle:%{public}s, pid:%{public}d, uid:%{public}d, size:%{public}d",
data.bundleName.c_str(), data.pid, data.uid, (int32_t)appStateObserverMap_.size());
HandleOnProcessCreatedCommon(data);
HandleOnProcessCreated(data);
}
void AppStateObserverManager::HandleOnProcessCreatedCommon(const ProcessData &data)
void AppStateObserverManager::HandleOnProcessCreated(const ProcessData &data)
{
std::lock_guard<std::recursive_mutex> lockNotify(observerLock_);
for (auto it = appStateObserverMap_.begin(); it != appStateObserverMap_.end(); ++it) {
@@ -265,7 +265,7 @@ void AppStateObserverManager::HandleOnProcessCreatedCommon(const ProcessData &da
}
}
void AppStateObserverManager::HandleOnProcessDied(const std::shared_ptr<AppRunningRecord> &appRecord)
void AppStateObserverManager::HandleOnAppProcessDied(const std::shared_ptr<AppRunningRecord> &appRecord)
{
if (!appRecord) {
HILOG_ERROR("app record is null");
@@ -274,7 +274,7 @@ void AppStateObserverManager::HandleOnProcessDied(const std::shared_ptr<AppRunni
ProcessData data = WrapProcessData(appRecord);
HILOG_DEBUG("Process died, bundle:%{public}s, pid:%{public}d, uid:%{public}d, size:%{public}d.",
data.bundleName.c_str(), data.pid, data.uid, (int32_t)appStateObserverMap_.size());
HandleOnProcessDiedCommon(data);
HandleOnProcessDied(data);
}
void AppStateObserverManager::HandleOnRenderProcessDied(const std::shared_ptr<RenderRecord> &renderRecord)
@@ -286,10 +286,10 @@ void AppStateObserverManager::HandleOnRenderProcessDied(const std::shared_ptr<Re
ProcessData data = WrapRenderProcessData(renderRecord);
HILOG_DEBUG("Render Process died, bundle:%{public}s, pid:%{public}d, uid:%{public}d, size:%{public}d.",
data.bundleName.c_str(), data.pid, data.uid, (int32_t)appStateObserverMap_.size());
HandleOnProcessDiedCommon(data);
HandleOnProcessDied(data);
}
void AppStateObserverManager::HandleOnProcessDiedCommon(const ProcessData &data)
void AppStateObserverManager::HandleOnProcessDied(const ProcessData &data)
{
std::lock_guard<std::recursive_mutex> lockNotify(observerLock_);
for (auto it = appStateObserverMap_.begin(); it != appStateObserverMap_.end(); ++it) {