summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-05-19 13:12:30 -0500
committerandroid-build-merger2017-05-19 13:12:30 -0500
commitde439332ba16ffad0d1ce7c2a2985655dbe7f8be (patch)
treee12523ccad54651af24dce86cb7a9c426767a3b9
parentb34b448bcd059602f33e9b5059d354d89dc8b74d (diff)
parent6a93fd7e7c4fa43f61e335db40e6e462090e4bb6 (diff)
downloadplatform-system-core-de439332ba16ffad0d1ce7c2a2985655dbe7f8be.tar.gz
platform-system-core-de439332ba16ffad0d1ce7c2a2985655dbe7f8be.tar.xz
platform-system-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
-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[] = {
200 // Support wifi_hal_legacy administering a network interface. 200 // Support wifi_hal_legacy administering a network interface.
201 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | 201 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
202 CAP_MASK_LONG(CAP_NET_RAW), 202 CAP_MASK_LONG(CAP_NET_RAW),
203 "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
204 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
205 CAP_MASK_LONG(CAP_NET_RAW),
203 "vendor/bin/hw/android.hardware.wifi@1.0-service" }, 206 "vendor/bin/hw/android.hardware.wifi@1.0-service" },
204 207
205 // A non-privileged zygote that spawns isolated processes for web rendering. 208 // A non-privileged zygote that spawns isolated processes for web rendering.