commit f7e92a235fa869cb58cd94912df99e2da91a3049
author Randy Pan <zpan@google.com> Thu Apr 27 03:50:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 03:50:45 2017 +0000
tree a2823df0c6488308d8ac1d1c64dee98c54d70727
parent 602380aa5fac7a347f81bbcbc15cc3e3e3f8ac5c
parent df54d0efc3a5c2920278246960ff695f9e15b93e

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

Change-Id: I631cc474f74c51f2de08d00b774f0d6c32818b5c

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