commit 2a345aaace57bb8d3d5700904eefd0d30b904bc3
author Randy Pan <zpan@google.com> Thu Apr 27 03:54:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 03:54:23 2017 +0000
tree 52abbd03e6e7a39e7a8c32ae042a6af3a6dda898
parent 39379dccae69d28a17094ab3b611f9bdfe584acc
parent 2cae03f4dbd6dea901390aff4ee19c6631cb0e05

Merge "Revert "Remove capability setting for legacy_wifi_hal"" into oc-dev am: df54d0efc3
am: f7e92a235f

Change-Id: Ie5c31fdc751d59b7261e7667167a43076d486ff4

libcutils/fs_config.c

diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 1b7139b..b802202 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -195,6 +195,11 @@
                                            CAP_MASK_LONG(CAP_SYS_NICE),
                                               "vendor/bin/hw/android.hardware.bluetooth@1.0-service" },
 
+    /* Support wifi_hal_legacy administering a network interface. */
+    { 00755, AID_WIFI,      AID_WIFI,      CAP_MASK_LONG(CAP_NET_ADMIN) |
+                                           CAP_MASK_LONG(CAP_NET_RAW),
+                                              "vendor/bin/hw/android.hardware.wifi@1.0-service" },
+
     /* A non-privileged zygote that spawns
      * isolated processes for web rendering. */
     { 0750,  AID_ROOT,      AID_ROOT,      CAP_MASK_LONG(CAP_SETUID) |