Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB HAL: Fix infinite loop.

Browse Source 
Bug: 35726475
Test: usb-service no longer consumes 100% CPU
Change-Id: I274caec45e7527cbacf57f9a735d711dcb481bfd
This commit is contained in:
Badhri Jagan Sridharan
2017-02-24 05:49:29 -08:00
parent 393f3907ec
commit b31cbe9453
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
usb/1.0/default/Usb.cpp
View File

@@ -172,17 +172,22 @@ rescan:
ports++;
}
}
if (ports == 0) {
closedir(dp);
return Status::SUCCESS;
}
names.resize(ports);
rewinddir(dp);
while ((ep = readdir (dp))) {
/* Check to see if new ports were added since the first pass. */
if (current >= ports) {
rewinddir(dp);
goto rescan;
}
if (ep->d_type == DT_LNK) {
/* Check to see if new ports were added since the first pass. */
if (current >= ports) {
rewinddir(dp);
goto rescan;
}
names[current++] = ep->d_name;
}
}
@@ -234,7 +239,7 @@ Status getPortStatusHelper (hidl_vec<PortStatus>& currentPortStatus) {
if (result == Status::SUCCESS) {
currentPortStatus.resize(names.size());
for(std::vector<std::string>::size_type i = 0; i != names.size(); i++) {
for(std::vector<std::string>::size_type i = 0; i < names.size(); i++) {
ALOGI("%s", names[i].c_str());
currentPortStatus[i].portName = names[i];