From 5e08854c26e41e514cb4c00794fa9298b747d729 Mon Sep 17 00:00:00 2001
From: caochao <2930650069@qq.com>
Date: Fri, 14 Jan 2022 15:54:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E5=92=8C=E7=B1=BB=E5=90=8D=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: cao_liu_chao <caochao12@huawei.com>
---
 services/devicemanagerservice/BUILD.gn                         | 2 +-
 .../include/config/{config_manager.h => dm_config_manager.h}   | 0
 .../src/adapter/standard/dm_adapter_manager.cpp                | 2 +-
 .../src/authentication/dm_auth_manager.cpp                     | 3 +--
 .../src/config/{config_manager.cpp => dm_config_manager.cpp}   | 2 +-
 test/unittest/BUILD.gn                                         | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename services/devicemanagerservice/include/config/{config_manager.h => dm_config_manager.h} (100%)
 rename services/devicemanagerservice/src/config/{config_manager.cpp => dm_config_manager.cpp} (99%)

diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn
index 0b95c557..6690b793 100644
--- a/services/devicemanagerservice/BUILD.gn
+++ b/services/devicemanagerservice/BUILD.gn
@@ -67,7 +67,7 @@ if (defined(ohos_lite)) {
       "src/authentication/auth_response_state.cpp",
       "src/authentication/auth_ui.cpp",
       "src/authentication/dm_auth_manager.cpp",
-      "src/config/config_manager.cpp",
+      "src/config/dm_config_manager.cpp",
       "src/dependency/commonevent/dm_common_event_manager.cpp",
       "src/dependency/hichain/hichain_connector.cpp",
       "src/dependency/softbus/softbus_connector.cpp",
diff --git a/services/devicemanagerservice/include/config/config_manager.h b/services/devicemanagerservice/include/config/dm_config_manager.h
similarity index 100%
rename from services/devicemanagerservice/include/config/config_manager.h
rename to services/devicemanagerservice/include/config/dm_config_manager.h
diff --git a/services/devicemanagerservice/src/adapter/standard/dm_adapter_manager.cpp b/services/devicemanagerservice/src/adapter/standard/dm_adapter_manager.cpp
index d7913a6d..e93ca820 100644
--- a/services/devicemanagerservice/src/adapter/standard/dm_adapter_manager.cpp
+++ b/services/devicemanagerservice/src/adapter/standard/dm_adapter_manager.cpp
@@ -15,7 +15,7 @@
 
 #include "dm_adapter_manager.h"
 
-#include "config_manager.h"
+#include "dm_config_manager.h"
 #include "dm_constants.h"
 #include "dm_log.h"
 
diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
index bdb23c69..0b3eb369 100644
--- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
+++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
@@ -15,10 +15,9 @@
 
 #include "dm_auth_manager.h"
 
-#include "auth_message_processor.h"
 #include "auth_ui.h"
-#include "config_manager.h"
 #include "dm_ability_manager.h"
+#include "dm_config_manager.h"
 #include "dm_constants.h"
 #include "dm_log.h"
 #include "dm_random.h"
diff --git a/services/devicemanagerservice/src/config/config_manager.cpp b/services/devicemanagerservice/src/config/dm_config_manager.cpp
similarity index 99%
rename from services/devicemanagerservice/src/config/config_manager.cpp
rename to services/devicemanagerservice/src/config/dm_config_manager.cpp
index 76b77a30..b91a0927 100644
--- a/services/devicemanagerservice/src/config/config_manager.cpp
+++ b/services/devicemanagerservice/src/config/dm_config_manager.cpp
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "config_manager.h"
+#include "dm_config_manager.h"
 
 #include <dlfcn.h>
 
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index d1f6bda8..2bd26f5a 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -103,7 +103,7 @@ ohos_unittest("UTTest_dm_device_state_manager") {
 
   sources = [
     "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/adapter/standard/dm_adapter_manager.cpp",
-    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/config/config_manager.cpp",
+    "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/config/dm_config_manager.cpp",
     "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/dependency/softbus/softbus_connector.cpp",
     "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/dependency/softbus/softbus_session.cpp",
     "//foundation/distributedhardware/devicemanager/services/devicemanagerservice/src/dependency/timer/dm_timer.cpp",