Merge "Add support for per device bluetooth configuration." into jb-mr1-dev
diff --git a/bthid.ko b/bthid.ko
deleted file mode 100644
index a2d82a1..0000000
--- a/bthid.ko
+++ /dev/null
Binary files differ
diff --git a/device.mk b/device.mk
index 3c343a4..113d97a 100644
--- a/device.mk
+++ b/device.mk
@@ -79,9 +79,6 @@
PRODUCT_COPY_FILES += \
system/bluetooth/data/main.le.conf:system/etc/bluetooth/main.conf
-PRODUCT_COPY_FILES += \
- device/samsung/tuna/bthid.ko:system/lib/modules/bthid.ko
-
# Wifi
ifneq ($(TARGET_PREBUILT_WIFI_MODULE),)
PRODUCT_COPY_FILES += \
@@ -146,9 +143,6 @@
frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml
-PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
-packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml)
-
# Melfas touchscreen firmware
PRODUCT_COPY_FILES += \
device/samsung/tuna/mms144_ts_rev31.fw:system/vendor/firmware/mms144_ts_rev31.fw \
diff --git a/init.tuna.rc b/init.tuna.rc
index bf91ed4..00a3865 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -1,16 +1,20 @@
import init.tuna.usb.rc
on init
- mkdir /mnt/secure/sdcard0 0700 root root
+ mkdir /mnt/shell/sdcard0 0700 shell shell
+ # External storage path for apps
export EXTERNAL_STORAGE /storage/sdcard0
+ # External storage path for adb
+ export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0
+
mkdir /storage 0711 root root
mkdir /storage/sdcard0 0000 root root
symlink /storage/sdcard0 /sdcard
symlink /storage/sdcard0 /mnt/sdcard
# Save bugreports as owner
- export BUGREPORT_WRITE_PATH /mnt/secure/sdcard0/0
+ export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0
export BUGREPORT_READ_PATH /storage/sdcard0
on post-fs-data
@@ -50,11 +54,6 @@
write /sys/bus/usb/devices/usb1/power/autosuspend_delay_ms 0
write /sys/bus/usb/devices/usb2/power/autosuspend_delay_ms 0
-# Start kernel driver (for BTHID)
- insmod /system/lib/modules/bthid.ko
- chmod 0660 /dev/bthid
- chown bluetooth bluetooth /dev/bthid
-
on fs
mkdir /factory 0775 radio radio
mount_all /fstab.tuna
@@ -167,7 +166,7 @@
oneshot
# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/secure/sdcard0 1023 1023
+service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023
class late_start
service p2p_supplicant /system/bin/wpa_supplicant \
diff --git a/kernel b/kernel
index 94d37f0..76fe9fb 100644
--- a/kernel
+++ b/kernel
Binary files differ
