Skip to content

fix: add non-USB keyboard directly without VID/PID check #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jul 30, 2026
Merged

fix: add non-USB keyboard directly without VID/PID check #716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion deepin-devicemanager/src/DeviceManager/DeviceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,9 +1527,19 @@ void DeviceManager::addKeyboardDevice(DeviceInput *const device)

QString vid = device->getVID();
QString pid = device->getPID();
QString interface = device->getInterface();

// 仅USB键盘具备有效的VID/PID,需要通过lsusb校验以过滤无效/幽灵USB设备。
// PS/2、I2C、蓝牙等内置键盘没有VID/PID(hwinfo中为 "Vendor: 0xNNNN" 单段格式,
// 无法解析出VID/PID),应直接添加,避免被误删导致键盘无法显示。
if (!interface.contains("USB", Qt::CaseInsensitive)) {
m_ListDeviceKeyboard.append(device);
qCDebug(appLog) << "Non-USB keyboard added directly, interface:" << interface;
return;
}

if (vid.isEmpty() || pid.isEmpty()) {
qCDebug(appLog) << "VID or PID is empty, adding keyboard device without verification";
qCDebug(appLog) << "USB keyboard VID or PID is empty, device not added";
device->deleteLater();
return;
}
Expand Down
Loading