summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2017-05-19 18:12:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 18:12:30 +0000
commitde439332ba16ffad0d1ce7c2a2985655dbe7f8be (patch)
treee12523ccad54651af24dce86cb7a9c426767a3b9 /libcutils
parentb34b448bcd059602f33e9b5059d354d89dc8b74d (diff)
parent6a93fd7e7c4fa43f61e335db40e6e462090e4bb6 (diff)
downloadcore-de439332ba16ffad0d1ce7c2a2985655dbe7f8be.tar.gz
core-de439332ba16ffad0d1ce7c2a2985655dbe7f8be.tar.bz2
core-de439332ba16ffad0d1ce7c2a2985655dbe7f8be.zip
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 Change-Id: Ifc81c5a2b17176711138c34b1a82ac945e7186a6
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/fs_config.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 40d3476ae..f73dabfb2 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -200,6 +200,9 @@ static const struct fs_path_config android_files[] = {
// 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.