commit cbf40af3e5677300ad8d54749a2f84c6f96d27c5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 07 22:28:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 07 22:28:10 2016 +0000
tree 3905f36c8665b85b2082aa74d96f7fb377afc5f0
parent 2975996052443e17f36baf9ced11fe22da26523e
parent 0334f033ebc99d657db8c4d41ea1dc6c4d2ebccc

Merge "Teach debuggerd about SIGSYS SYS_SECCOMP signals."

base/logging_test.cpp

diff --git a/base/logging_test.cpp b/base/logging_test.cpp
index 3de42b7..8ecd8fd 100644
--- a/base/logging_test.cpp
+++ b/base/logging_test.cpp
@@ -126,7 +126,12 @@
   char log_char = log_characters[severity];
   std::string holder(__FILE__);
   return android::base::StringPrintf(
-      "%c[[:space:]]+[[:digit:]]+[[:space:]]+[[:digit:]]+ %s:[[:digit:]]+] %s",
+      "%c[[:space:]]+"
+      "[[:digit:]]+-[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+:[[:digit:]]+:[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+[[:space:]]+"
+      "[[:digit:]]+[[:space:]]+"
+      "%s:[[:digit:]]+] %s",
       log_char, basename(&holder[0]), message);
 }
 

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 840ac86..2922ec4 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -142,6 +142,10 @@
     { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) | CAP_MASK_LONG(CAP_SETGID), "system/bin/run-as" },
     { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND), "system/bin/inputflinger" },
 
+    /* Support hostapd administering a network interface. */
+    { 00755, AID_WIFI,      AID_WIFI,     CAP_MASK_LONG(CAP_NET_ADMIN) |
+                                          CAP_MASK_LONG(CAP_NET_RAW),    "system/bin/hostapd" },
+
     { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/uncrypt" },
     { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/install-recovery.sh" },
     { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/*" },