summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Cardenas2017-05-03 14:42:52 -0500
committerandroid-build-merger2017-05-03 14:42:52 -0500
commit21fff17ed6f4cac8dd75f64b6c2d8df8e53048f0 (patch)
treeec9da5d991e2c071076dd0335422e16ca3e6eaa4 /libcutils/fs_config.cpp
parent214e45a5a74f341381496c27ea06ce8247b0faa9 (diff)
parent6db432daf7a8f199630c5b35c3cff57c566b68fa (diff)
downloadplatform-system-core-21fff17ed6f4cac8dd75f64b6c2d8df8e53048f0.tar.gz
platform-system-core-21fff17ed6f4cac8dd75f64b6c2d8df8e53048f0.tar.xz
platform-system-core-21fff17ed6f4cac8dd75f64b6c2d8df8e53048f0.zip
Partial revert of "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" Revert just the wifi hardware part.
am: 6db432daf7 Change-Id: I7796ffcf07d6478ead19c5bab171a9ff4ce4f758
Diffstat (limited to 'libcutils/fs_config.cpp')
-rw-r--r--libcutils/fs_config.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/libcutils/fs_config.cpp b/libcutils/fs_config.cpp
index 27750fe06..55e393cc1 100644
--- a/libcutils/fs_config.cpp
+++ b/libcutils/fs_config.cpp
@@ -210,9 +210,6 @@ static const struct fs_path_config android_files[] = {
210 // Support wifi_hal_legacy administering a network interface. 210 // Support wifi_hal_legacy administering a network interface.
211 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) | 211 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
212 CAP_MASK_LONG(CAP_NET_RAW), 212 CAP_MASK_LONG(CAP_NET_RAW),
213 "system/vendor/bin/hw/android.hardware.wifi@1.0-service" },
214 { 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
215 CAP_MASK_LONG(CAP_NET_RAW),
216 "vendor/bin/hw/android.hardware.wifi@1.0-service" }, 213 "vendor/bin/hw/android.hardware.wifi@1.0-service" },
217 214
218 // A non-privileged zygote that spawns isolated processes for web rendering. 215 // A non-privileged zygote that spawns isolated processes for web rendering.