openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "liblog#__android_log_btwrite__android_logger_list_read fail" am: 692c9973e1 am: 3b3bf74b53 

am: fab7146f12

Change-Id: I202eb80f4c7336dcffdbf73e98fb9435cf11cf30
This commit is contained in:
Tom Cherry 2018-09-21 14:00:15 -07:00 committed by android-build-merger
parent e63d07470a fab7146f12
commit a9da5ad37a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liblog/tests/liblog_test.cpp
View File

@ -131,7 +131,7 @@ static bool isPmsgActive() {
static bool isLogdwActive() {
std::string logdwSignature =
popenToString("grep /dev/socket/logdw /proc/net/unix");
popenToString("grep -a /dev/socket/logdw /proc/net/unix");
size_t beginning = logdwSignature.find(' ');
if (beginning == std::string::npos) return true;
beginning = logdwSignature.find(' ', beginning + 1);
@ -145,7 +145,7 @@ static bool isLogdwActive() {
end = logdwSignature.find(' ', end + 1);
if (end == std::string::npos) return true;
std::string allLogdwEndpoints = popenToString(
"grep ' 00000002" + logdwSignature.substr(beginning, end - beginning) +
"grep -a ' 00000002" + logdwSignature.substr(beginning, end - beginning) +
" ' /proc/net/unix | " +
"sed -n 's/.* \\([0-9][0-9]*\\)$/ -> socket:[\\1]/p'");
if (allLogdwEndpoints.length() == 0) return true;