commit e551125cfa4861a0b023222de04a028209b35dce
author Mitchell Wills <mwills@google.com> Mon Aug 29 18:13:09 2016 -0700
committer Mitchell Wills <mwills@google.com> Mon Aug 29 18:13:09 2016 -0700
tree cbae2d4abf9a8056cb3a4186007d3bb0c22929dd
parent f1b3b636d33b6bc65cf863fe42e68fb3b1cce930
parent 5a33ad4d5210346a4a4c11af7ffbc82e0cffa53c

Merge commit '5a33ad4d5210346a4a4c11af7ffbc82e0cffa53c' into manual_merge_5a33ad4

Change-Id: I873555a7284323e6ca839cf4982f9d07f49a5f4e

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 9acfa58..a6eaf11 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -146,6 +146,10 @@
     /* Support FIFO scheduling mode in SurfaceFlinger. */
     { 00755, AID_SYSTEM,    AID_GRAPHICS,     CAP_MASK_LONG(CAP_SYS_NICE), "system/bin/surfaceflinger" },
 
+    /* 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/*" },