From 2d2bd92f7ffe63cb0082bf984932c64ab0ef9b6c Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Tue, 16 Dec 2025 16:29:41 +0800 Subject: [PATCH 1/3] fix: disable bluetooth failed disable bluetooth failed due to name log: fix the disable bluetooth failed bug: https://pms.uniontech.com/bug-view-341783.html Change-Id: I4495dc67a1480ae3695c253b474e3dd45c11442a --- deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp index 3daa08c8..c8605eb0 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp @@ -37,7 +37,7 @@ void DeviceBluetooth::setInfoFromHciconfig(const QMap &mapInfo { qCDebug(appLog) << "DeviceBluetooth::setInfoFromHciconfig started."; // 获取设备的基本信息 - setAttribute(mapInfo, "Name", m_Name); + setAttribute(mapInfo, "Name", m_Name, false); setAttribute(mapInfo, "Alias", m_Alias); setAttribute(mapInfo, "Manufacturer", m_Vendor); setAttribute(mapInfo, "HCI Version", m_Version, true); From 2dc5bf532bd9e7d2547cef35c6a8a050dbab56e5 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Thu, 18 Dec 2025 10:15:40 +0800 Subject: [PATCH 2/3] fix: from dmidecode get cpu num error fix from dmidecode get cpu num maybe error log: fix from dmidecode get cpu num maybe error bug: https://pms.uniontech.com/bug-view-343951.html --- .../src/GenerateDevice/DeviceGenerator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp b/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp index 943be265..afd47696 100644 --- a/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp +++ b/deepin-devicemanager/src/GenerateDevice/DeviceGenerator.cpp @@ -222,10 +222,13 @@ void DeviceGenerator::generatorCpuDevice() logicalNum_dmi += dd4["Thread Count"].toInt(); } } + if(coreNum_dmi > coreNum && coreNum_dmi <= 512) { //due to offline policy + // If obtaining data from /proc/cpuinfo is incorrect, refer to the content of dmidecode. + if (logicalNum != logicalNum_dmi) + coreNum = coreNum_dmi; + } if(logicalNum_dmi > logicalNum && logicalNum_dmi < 1024) //due to offline policy logicalNum = logicalNum_dmi; - if(coreNum_dmi > coreNum && coreNum_dmi <= 512) //due to offline policy - coreNum = coreNum_dmi; DeviceManager::instance()->setCpuNum(allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size()); qCDebug(appLog) << "DeviceGenerator::generatorCpuDevice set cpu num" << (allCPUS.isEmpty() ? dmidecode4.size() : allCPUS.size()); From 39d1c2a823fc41275ca6356fd2dca6e801657a0d Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Wed, 21 Jan 2026 13:55:15 +0800 Subject: [PATCH 3/3] fix(bluetooth): remove hci version attribute setting remove hci version attribute setting pick from: https://github.com/add-uos/deepin-devicemanager/commit/1d58066d2d9916bcca863e49b569c07889df26e2 log: remove hci version attribute setting bug: https://pms.uniontech.com/bug-view-347359.html Change-Id: I10ee960525c16efa86869f13fbf24d4a06fcde81 --- deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp index c8605eb0..f83b618c 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp @@ -40,7 +40,6 @@ void DeviceBluetooth::setInfoFromHciconfig(const QMap &mapInfo setAttribute(mapInfo, "Name", m_Name, false); setAttribute(mapInfo, "Alias", m_Alias); setAttribute(mapInfo, "Manufacturer", m_Vendor); - setAttribute(mapInfo, "HCI Version", m_Version, true); qCDebug(appLog) << "Basic attributes set from Hciconfig."; // 获取设备其他信息