From 1a3df58968cd7935df6fb4081eb5bbdf7268a14b Mon Sep 17 00:00:00 2001
From: m00512953 <mingxihua@huawei.com>
Date: Thu, 11 Aug 2022 14:44:16 +0800
Subject: [PATCH] mingxihua@huawei.com.cn

Signed-off-by: m00512953 <mingxihua@huawei.com>
---
 .../src/connection_state_manager.cpp          |  6 +++---
 .../include/app_state_observer_manager.h      |  6 +++---
 .../appmgr/src/app_state_observer_manager.cpp | 20 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/services/abilitymgr/src/connection_state_manager.cpp b/services/abilitymgr/src/connection_state_manager.cpp
index 567e8aa5cf..f1a1269376 100644
--- a/services/abilitymgr/src/connection_state_manager.cpp
+++ b/services/abilitymgr/src/connection_state_manager.cpp
@@ -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_) {
diff --git a/services/appmgr/include/app_state_observer_manager.h b/services/appmgr/include/app_state_observer_manager.h
index ca0a0955c2..10eca4a842 100644
--- a/services/appmgr/include/app_state_observer_manager.h
+++ b/services/appmgr/include/app_state_observer_manager.h
@@ -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:
diff --git a/services/appmgr/src/app_state_observer_manager.cpp b/services/appmgr/src/app_state_observer_manager.cpp
index ea27187a9e..316aee37ab 100644
--- a/services/appmgr/src/app_state_observer_manager.cpp
+++ b/services/appmgr/src/app_state_observer_manager.cpp
@@ -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) {