commit d05809eb7ffa0c322f2a2d88d228f314c43e8979
author Tom Cherry <tomcherry@google.com> Wed Mar 28 18:30:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 28 18:30:49 2018 +0000
tree ed3759b21050616153dcc524c919bb1498517f99
parent 04c216dd3d1eacb67c7be9fbad7ceee571a51ac7
parent 6f4c5a62d91326b0de6eda1fc0cf3dffa2213cbb

Merge "Revert "fs_config: Move hostapd to /vendor/bin/hw"" into pi-dev

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 10050eb..f6f7128 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -186,16 +186,11 @@
     { 00755, AID_SYSTEM,    AID_GRAPHICS,  CAP_MASK_LONG(CAP_SYS_NICE),
                                               "system/bin/surfaceflinger" },
 
-    // Support hostapd administering a network interface (Old Path: <= O-MR1 release).
+    // Support hostapd administering a network interface.
     { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
                                            CAP_MASK_LONG(CAP_NET_RAW),
                                               "vendor/bin/hostapd" },
 
-    // Support hostapd administering a network interface (New Path: >= P release).
-    { 00750, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
-                                           CAP_MASK_LONG(CAP_NET_RAW),
-                                              "vendor/bin/hw/hostapd" },
-
     // Support Bluetooth legacy hal accessing /sys/class/rfkill
     // Support RT scheduling in Bluetooth
     { 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |