diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h
index 901a30b7a175676d860b062641e2db95cb6cc5d4..cdbece3c1c83fec27e6490c25054225b15f772e9 100755
--- a/common/include/dm_constants.h
+++ b/common/include/dm_constants.h
@@ -200,7 +200,8 @@ extern const char* DM_VERSION_5_1_2;
 extern const char* DM_CURRENT_VERSION;
 extern const char* DM_ACL_AGING_VERSION;
 extern const char* DM_VERSION_5_0_OLD_MAX;      // Estimated highest version number of the old version
-extern const int32_t DM_HO_OSTYPE;
+extern const int32_t OLD_DM_HO_OSTYPE;
+extern const int32_t NEW_DM_HO_OSTYPE;
 extern const int32_t DM_OH_OSTYPE;
 extern const char* PEER_UDID;
 extern const char* PEER_OSTYPE;
diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp
index 5a2632e9dbc5bc6bd26f6ef8e506d5769b2e6c95..e6ea1205fdd0faaf02bbc85c48739eb3b34dc03b 100644
--- a/common/src/dm_constants.cpp
+++ b/common/src/dm_constants.cpp
@@ -188,7 +188,8 @@ const char* DM_VERSION_5_1_2 = "5.1.2";
 const char* DM_CURRENT_VERSION = DM_VERSION_5_1_2;
 const char* DM_ACL_AGING_VERSION = DM_VERSION_5_1_0;
 const char* DM_VERSION_5_0_OLD_MAX = "5.0.99";       // Estimated highest version number of the old version
-const int32_t DM_HO_OSTYPE = -1;
+const int32_t OLD_DM_HO_OSTYPE = -1;
+const int32_t NEW_DM_HO_OSTYPE = 11;
 const int32_t DM_OH_OSTYPE = 10;
 const char* PEER_UDID = "peer_udid";
 const char* PEER_OSTYPE = "peer_ostype";
diff --git a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp
index 0b2bfebaeeaaacfb6e73813b8ddab509eb866af2..2093b0d8560abadc711e6268512923e2f001c698 100644
--- a/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp
+++ b/interfaces/inner_kits/native_cpp/src/device_manager_impl.cpp
@@ -415,8 +415,8 @@ int32_t DeviceManagerImpl::RegisterDevStateCallback(const std::string &pkgName,
         return ret;
     }
 #endif
-    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName);
     DeviceManagerNotify::GetInstance().RegisterDeviceStateCallback(pkgName, callback);
+    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName);
     DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegisterDevStateCallback", DM_OK, anonyLocalUdid_);
     LOGI("Completed");
     return DM_OK;
@@ -432,8 +432,8 @@ int32_t DeviceManagerImpl::RegisterDevStatusCallback(const std::string &pkgName,
         return ERR_DM_INPUT_PARA_INVALID;
     }
     LOGI("Start, pkgName: %{public}s", pkgName.c_str());
-    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName);
     DeviceManagerNotify::GetInstance().RegisterDeviceStatusCallback(pkgName, callback);
+    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_STATE, pkgName);
     DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegisterDevStatusCallback", DM_OK, anonyLocalUdid_);
     LOGI("Completed");
     return DM_OK;
@@ -2318,8 +2318,8 @@ int32_t DeviceManagerImpl::RegDevTrustChangeCallback(const std::string &pkgName,
         return ERR_DM_INPUT_PARA_INVALID;
     }
     LOGI("PkgName %{public}s.", pkgName.c_str());
-    SyncCallbackToService(DmCommonNotifyEvent::REG_REMOTE_DEVICE_TRUST_CHANGE, pkgName);
     DeviceManagerNotify::GetInstance().RegDevTrustChangeCallback(pkgName, callback);
+    SyncCallbackToService(DmCommonNotifyEvent::REG_REMOTE_DEVICE_TRUST_CHANGE, pkgName);
     DmRadarHelper::GetInstance().ReportDmBehavior(pkgName, "RegDevTrustChangeCallback", DM_OK, anonyLocalUdid_);
     return DM_OK;
 }
@@ -2331,8 +2331,8 @@ int32_t DeviceManagerImpl::RegisterDeviceScreenStatusCallback(const std::string
         LOGE("Error: Invalid para");
         return ERR_DM_INPUT_PARA_INVALID;
     }
-    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE, pkgName);
     DeviceManagerNotify::GetInstance().RegisterDeviceScreenStatusCallback(pkgName, callback);
+    SyncCallbackToService(DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE, pkgName);
     LOGI("Completed, pkgName: %{public}s", pkgName.c_str());
     return DM_OK;
 }
@@ -2415,8 +2415,8 @@ int32_t DeviceManagerImpl::RegisterCredentialAuthStatusCallback(const std::strin
         LOGE("Error: Invalid para");
         return ERR_DM_INPUT_PARA_INVALID;
     }
-    SyncCallbackToService(DmCommonNotifyEvent::REG_CREDENTIAL_AUTH_STATUS_NOTIFY, pkgName);
     DeviceManagerNotify::GetInstance().RegisterCredentialAuthStatusCallback(pkgName, callback);
+    SyncCallbackToService(DmCommonNotifyEvent::REG_CREDENTIAL_AUTH_STATUS_NOTIFY, pkgName);
     LOGI("Completed, pkgName: %{public}s", pkgName.c_str());
     return DM_OK;
 }
diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp
index 4b66bb6555a70509c07742fb4c38caeaff94c812..9682567237b3120e44d4211d5a175c76cb4fee1b 100644
--- a/services/service/src/device_manager_service.cpp
+++ b/services/service/src/device_manager_service.cpp
@@ -4436,7 +4436,8 @@ void DeviceManagerService::GetHoOsTypeUdids(std::vector<std::string> &peerUdids)
             LOGE("osTypeObj value invalid.");
             continue;
         }
-        if (osTypeObj[PEER_OSTYPE].Get<int32_t>() == DM_HO_OSTYPE) {
+        if (osTypeObj[PEER_OSTYPE].Get<int32_t>() == OLD_DM_HO_OSTYPE ||
+            osTypeObj[PEER_OSTYPE].Get<int32_t>() == NEW_DM_HO_OSTYPE) {
             peerUdids.push_back(osTypeObj[PEER_UDID].Get<std::string>());
         }
     }
diff --git a/utils/src/kvadapter/kv_adapter.cpp b/utils/src/kvadapter/kv_adapter.cpp
index 7c7495bb009b072b23740a4f4b11a139859d7ad8..f0b8d0a533f00dcade0774be1f6b9786277bb5ec 100644
--- a/utils/src/kvadapter/kv_adapter.cpp
+++ b/utils/src/kvadapter/kv_adapter.cpp
@@ -42,8 +42,8 @@ namespace {
     constexpr int32_t INIT_RETRY_SLEEP_INTERVAL = 200 * 1000; // 200ms
     constexpr uint32_t DM_OSTYPE_PREFIX_LEN = 16;
     const char* PEER_UDID = "peer_udid";
-    const char* PEER_OSTYPE = "peer_os_type";
-    const char* TIME_STAMP = "timestamp";
+    const char* PEER_OSTYPE = "peer_ostype";
+    const char* TIME_STAMP = "time_stamp";
 }
 
 int32_t KVAdapter::Init()