summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorZhihai Xu <zhihaixu@google.com>2012-09-20 16:43:26 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-20 16:43:26 -0700
commite16534f8f7492755aebe4c54089b5298f4b064be (patch)
treec8f806cf3ab141c2c588cd7f75b440b733350d36 /include
parent37bd30bfd59a352452aea474ece764a6a14f71a9 (diff)
parentc2f59d87d85e4c7ec9a7f899dd4f55a36b3627f5 (diff)
downloadsystem_core-e16534f8f7492755aebe4c54089b5298f4b064be.zip
system_core-e16534f8f7492755aebe4c54089b5298f4b064be.tar.gz
system_core-e16534f8f7492755aebe4c54089b5298f4b064be.tar.bz2
Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
Diffstat (limited to 'include')
-rw-r--r--include/private/android_filesystem_config.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 33ecd9a..8f4956c 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -191,12 +191,6 @@ static struct fs_path_config android_files[] = {
{ 00550, AID_ROOT, AID_SHELL, "system/etc/init.testmenu" },
{ 00550, AID_DHCP, AID_SHELL, "system/etc/dhcpcd/dhcpcd-run-hooks" },
{ 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/dbus.conf" },
- { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluetooth/main.conf" },
- { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluetooth/input.conf" },
- { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluetooth/audio.conf" },
- { 00440, AID_BLUETOOTH, AID_BLUETOOTH, "system/etc/bluetooth/network.conf" },
- { 00444, AID_NET_BT, AID_NET_BT, "system/etc/bluetooth/blacklist.conf" },
- { 00640, AID_SYSTEM, AID_SYSTEM, "system/etc/bluetooth/auto_pairing.conf" },
{ 00444, AID_RADIO, AID_AUDIO, "system/etc/AudioPara4.csv" },
{ 00555, AID_ROOT, AID_ROOT, "system/etc/ppp/*" },
{ 00555, AID_ROOT, AID_ROOT, "system/etc/rc.*" },