commit a6da18548289a8c864aadc9d79d1f2ab8537e7a4
author Daniel Cardenas <danielcar@google.com> Wed May 03 19:45:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 19:45:51 2017 +0000
tree 6bd612edb17bebc7cdc394f2ded74d5d06854096
parent a4a1afc4a21f9677aa47674ea0b610c29fbed7a9
parent 0b8ce4c9c30eaa1f584be326f547a3f381adf525

Partial revert of "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" Revert just the wifi hardware part. am: 6db432daf7
am: 21fff17ed6

Change-Id: I21151d556b80801214555934bfd5923fa3b1379a

libcutils/fs_config.cpp

diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 27750fe..55e393c 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -210,9 +210,6 @@
     // 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.