From 1366766da686d2357ff2e28b076ab12640918a00 Mon Sep 17 00:00:00 2001
From: zhangchuang <zhangchuang.zhang@huawei.com>
Date: Tue, 5 Jul 2022 08:31:47 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!120=20:?=
 =?UTF-8?q?=20=E5=88=9D=E5=A7=8B=E5=8C=96=E5=88=A0=E9=99=A4=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E6=95=B0=E6=8D=AE'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../local_hardware_manager.h                  |  1 -
 .../local_hardware_manager.cpp                | 29 -------------------
 2 files changed, 30 deletions(-)

diff --git a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h b/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h
index d55077bd..1d75f085 100644
--- a/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h
+++ b/services/distributedhardwarefwkserviceimpl/include/localhardwaremanager/local_hardware_manager.h
@@ -43,7 +43,6 @@ public:
 private:
     void QueryLocalHardware(const DHType dhType, IHardwareHandler *hardwareHandler);
     void AddLocalCapabilityInfo(const std::vector<DHItem> &dhItems, const DHType dhType);
-    void RemoveNonExistCapabilityInfo();
 
 private:
     std::map<DHType, IHardwareHandler*> compToolFuncsMap_;
diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp b/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp
index a953f02a..1eaec6e6 100644
--- a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/local_hardware_manager.cpp
@@ -64,9 +64,6 @@ void LocalHardwareManager::Init()
             hardwareHandler->RegisterPluginListener(listener);
         }
     }
-
-    // Remove the non-exist data in database when device restart or other exception situation
-    RemoveNonExistCapabilityInfo();
 }
 
 void LocalHardwareManager::UnInit()
@@ -109,31 +106,5 @@ void LocalHardwareManager::AddLocalCapabilityInfo(const std::vector<DHItem> &dhI
     }
     CapabilityInfoManager::GetInstance()->AddCapability(capabilityInfos);
 }
-
-void LocalHardwareManager::RemoveNonExistCapabilityInfo()
-{
-    DHLOGI("start");
-    CapabilityInfoMap allCapabilityInfoMap;
-    CapabilityInfoManager::GetInstance()->GetDataByKeyPrefix("", allCapabilityInfoMap);
-    if (allCapabilityInfoMap.empty()) {
-        DHLOGE("allDataMap from DB is empty");
-        return;
-    }
-    for (auto capabilityInfo : allCapabilityInfoMap) {
-        std::shared_ptr<CapabilityInfo> capabilityValue = capabilityInfo.second;
-        if (capabilityValue == nullptr) {
-            DHLOGE("capabilityInfo value is nullptr, key: %s", capabilityValue->GetAnonymousKey().c_str());
-            return;
-        }
-        DHLOGI("The key in allCapabilityInfoMap is %s", capabilityValue->GetAnonymousKey().c_str());
-        if (!CapabilityInfoManager::GetInstance()->HasCapability(capabilityValue->GetDeviceId(),
-            capabilityValue->GetDHId())) {
-            DHLOGI("AllCapabilityInfoMap is not found this key, so it is previous data. It should be removed, key: %s",
-                capabilityValue->GetAnonymousKey().c_str());
-            CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoByKey(capabilityValue->GetKey());
-        }
-    }
-    DHLOGI("end");
-}
 } // namespace DistributedHardware
 } // namespace OHOS
-- 
Gitee