Skip to content

Fix the treble violations for bluetooth #2385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ceiba1985 wants to merge 1 commit into
base: celadon/a15/master
Choose a base branch
from
Open

Fix the treble violations for bluetooth #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions groups/bluetooth/ag620/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
on boot
insmod ${ro.vendor.boot.moduleslocation}/btif_drv.ko

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
disabled
oneshot
Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/auto/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml

PRODUCT_PROPERTY_OVERRIDES += bluetooth.rfkill=1
PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.rfkill=1

PRODUCT_PACKAGES += \
android.hardware.bluetooth@1.0-service.vbt \
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/autodetect/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

service dhcpcd_bt-pan /system/bin/dhcpcd -d -aABKL
disabled
oneshot
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/bcm43241/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/bcm43241/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:

{{^hsu}}
PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/bcm43340/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/bcm43340/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml

PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/bcm4339/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/bcm4339/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml

PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/bcm43430/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/bcm43430/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml

PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/bcm4356/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/bcm4356/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:

{{^hsu}}
PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/btusb/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
class main
user bluetooth
Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/btusb/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.bluetooth.xml:vendor/etc/permissions/android.hardware.bluetooth.xml \
frameworks/native/data/etc/android.hardware.bluetooth_le.xml:vendor/etc/permissions/android.hardware.bluetooth_le.xml

PRODUCT_PROPERTY_OVERRIDES += bluetooth.rfkill=1
PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.rfkill=1

PRODUCT_PACKAGES += \
android.hardware.bluetooth-service.default.vbt
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/rtl8723bs/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ on boot
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_max_credits
chmod 0644 /sys/kernel/debug/bluetooth/l2cap_le_default_mps

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

on property:vendor.bluetooth.hwcfg=start
start vendor.btcfg

Expand Down
2 changes: 1 addition & 1 deletion groups/bluetooth/rtl8723bs/product.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += frameworks/native/data/etc/android.hardware.bluetooth.xml:

{{^hsu}}
PRODUCT_PROPERTY_OVERRIDES += vendor.bluetooth.hwcfg=stop \
bluetooth.rfkill=1
vendor.bluetooth.rfkill=1

# Bluetooth eng / userdebug
ifneq ($(TARGET_BUILD_VARIANT),user)
Expand Down
3 changes: 0 additions & 3 deletions groups/bluetooth/stonepeak/init.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ on boot
insmod ${ro.vendor.boot.moduleslocation}/bluetooth.ko
insmod ${ro.vendor.boot.moduleslocation}/btusb.ko

on post-fs-data
mkdir /data/misc/dhcp 0770 dhcp system

service dhcpcd_bt-pan /system/bin/dhcpcd -ABKL
disabled
oneshot
Expand Down