Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9da5ad3 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "liblog#__android_log_btwrite__android_logger_list_read fail" am: 692c9973 am: 3b3bf74b 

am: fab7146f

Change-Id: I202eb80f4c7336dcffdbf73e98fb9435cf11cf30
parents e63d0747 fab7146f

liblog/tests/liblog_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;