summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot2017-05-19 13:07:03 -0500
committerAndroid (Google) Code Review2017-05-19 13:07:04 -0500
commit6a93fd7e7c4fa43f61e335db40e6e462090e4bb6 (patch)
treef21f5ac7c268a766ab159300d3832d65e7e6e67d
parent9c91d9029487146ea86edf2e1242af28f5712451 (diff)
parentcb0b5e6753006dd857e469162a8dbe14ede71bff (diff)
downloadplatform-system-core-6a93fd7e7c4fa43f61e335db40e6e462090e4bb6.tar.gz
platform-system-core-6a93fd7e7c4fa43f61e335db40e6e462090e4bb6.tar.xz
platform-system-core-6a93fd7e7c4fa43f61e335db40e6e462090e4bb6.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
-rw-r--r--libcutils/fs_config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c
index 17d7cb9b5..d98a923c9 100644
--- a/libcutils/fs_config.c
+++ b/libcutils/fs_config.c
@@ -214,6 +214,9 @@ static const struct fs_path_config android_files[] = {
214 /* Support wifi_hal_legacy administering a network interface. */ 214 /* Support wifi_hal_legacy administering a network interface. */
215 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | 215 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
216 CAP_MASK_LONG(CAP_NET_RAW), 216 CAP_MASK_LONG(CAP_NET_RAW),
217 "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
218 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
219 CAP_MASK_LONG(CAP_NET_RAW),
217 "vendor/bin/hw/android.hardware.wifi@1.0-service" }, 220 "vendor/bin/hw/android.hardware.wifi@1.0-service" },
218 221
219 /* A non-privileged zygote that spawns 222 /* A non-privileged zygote that spawns