commit 2c40768040a4acec806e3f17dc3a1a2bc573915f
author Mark Salyzyn <salyzyn@google.com> Fri May 19 18:14:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 19 18:14:29 2017 +0000
tree c7e7600e94c9166cc2692dfff563a1edaa16752f
parent 05e2c509dd89e5a35d0e7ac6a3be28edca0a00c3
parent de439332ba16ffad0d1ce7c2a2985655dbe7f8be

Merge "Revert "Partial revert of "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" Revert just the wifi hardware part."" into oc-dev am: 6a93fd7e7c
am: de439332ba

Change-Id: I01452558cfe986eed3dcddf6050e8cf6afd95de5

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 40d3476..f73dabf 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -200,6 +200,9 @@
     // 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),
+                                              "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
+    { 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.