commit 6f4c5a62d91326b0de6eda1fc0cf3dffa2213cbb
author Tom Cherry <tomcherry@google.com> Tue Mar 27 10:05:49 2018 -0700
committer Tom Cherry <tomcherry@google.com> Wed Mar 28 18:29:02 2018 +0000
tree 06ef4c9fac6206dbde7fd64b0bebc1ba31500139
parent 987a56d8928b4e1b68f970e68fabf6190d65deca

Revert "fs_config: Move hostapd to /vendor/bin/hw"

This reverts commit 656b75c77cbf6370012397b52952252f477ffdf3.

Capability bits are moving from fs_config.cpp to the associated init
scripts for daemons on /vendor.

Bug: 74554159
Test: wifi tethering works on walleye

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) |