ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Sort devices list before output."

Browse source
This commit is contained in:
Elliott Hughes 2018-01-08 22:11:23 +00:00 • committed by Gerrit Code Review
commit 18cdd3502a
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
adb/transport.cpp
View file

@ -952,10 +952,18 @@ static void append_transport(const atransport* t, std::string* result, bool long
} }
std::string list_transports(bool long_listing) { std::string list_transports(bool long_listing) {
std::string result;
std::lock_guard<std::recursive_mutex> lock(transport_lock); std::lock_guard<std::recursive_mutex> lock(transport_lock);
for (const auto& t : transport_list) {
auto sorted_transport_list = transport_list;
sorted_transport_list.sort([](atransport*& x, atransport*& y) {
if (x->type != y->type) {
return x->type < y->type;
}
return strcmp(x->serial, y->serial) < 0;
});
std::string result;
for (const auto& t : sorted_transport_list) {
append_transport(t, &result, long_listing); append_transport(t, &result, long_listing);
} }
return result; return result;