pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adb: switch usb_linux helper to string_view. 

Test: test_adb.py
Test: test_device.py
Test: $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test
Test: adb shell /data/nativetest64/adbd_test/adbd_test
Change-Id: Iccbeb61905852b72fceec1bca498895b38a2e7d4
This commit is contained in:
Josh Gao 2018-12-12 16:18:00 -08:00
parent 0f29cbc750
commit 5021cfc135
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
adb/client/usb_linux.cpp
View File

@ -39,6 +39,7 @@
#include <list>
#include <mutex>
#include <string>
#include <string_view>
#include <thread>
#include <android-base/file.h>
@ -90,7 +91,7 @@ struct usb_handle : public ::usb_handle {
static auto& g_usb_handles_mutex = *new std::mutex();
static auto& g_usb_handles = *new std::list<usb_handle*>();
static int is_known_device(const char* dev_name) {
static int is_known_device(std::string_view dev_name) {
std::lock_guard<std::mutex> lock(g_usb_handles_mutex);
for (usb_handle* usb : g_usb_handles) {
if (usb->path == dev_name) {
@ -152,7 +153,7 @@ static void find_usb_device(const std::string& base,
if (contains_non_digit(de->d_name)) continue;
std::string dev_name = bus_name + "/" + de->d_name;
if (is_known_device(dev_name.c_str())) {
if (is_known_device(dev_name)) {
continue;
}