Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Populate uniq field in uhid." into rvc-dev am: 5291e518a4

Browse Source 
Change-Id: I91797e4b4d3df14f1113b469b4582b099120f555
This commit is contained in:
Automerger Merge Worker
2020-02-25 19:41:54 +00:00
parent afbd22982b 5291e518a4
commit f821b32566
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/hid/jni/com_android_commands_hid_Device.cpp
View File

@@ -146,6 +146,8 @@ std::unique_ptr<Device> Device::open(int32_t id, const char* name, int32_t vid,
struct uhid_event ev = {}; struct uhid_event ev = {};
ev.type = UHID_CREATE2; ev.type = UHID_CREATE2;
strlcpy(reinterpret_cast<char*>(ev.u.create2.name), name, sizeof(ev.u.create2.name)); strlcpy(reinterpret_cast<char*>(ev.u.create2.name), name, sizeof(ev.u.create2.name));
std::string uniq = android::base::StringPrintf("Id: %d", id);
strlcpy(reinterpret_cast<char*>(ev.u.create2.uniq), uniq.c_str(), sizeof(ev.u.create2.uniq));
memcpy(&ev.u.create2.rd_data, descriptor.data(), size * sizeof(ev.u.create2.rd_data[0])); memcpy(&ev.u.create2.rd_data, descriptor.data(), size * sizeof(ev.u.create2.rd_data[0]));
ev.u.create2.rd_size = size; ev.u.create2.rd_size = size;
ev.u.create2.bus = bus; ev.u.create2.bus = bus;