Merge "Clean up bluetooth le feature file" into jb-mr2-dev
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8464813..1d54f77 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -52,6 +52,7 @@
btmacreader.te \
device.te \
drmserver.te \
+ init_shell.te \
file.te \
rild.te \
sensors_config.te \
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index aa61dba..3a0fbe1 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -27,5 +27,7 @@
#define BTIF_HF_SERVICES (BTA_HSP_SERVICE_MASK)
#define BTIF_HF_SERVICE_NAMES { BTIF_HSAG_SERVICE_NAME }
#define PAN_NAP_DISABLED TRUE
-
+#define BLE_INCLUDED FALSE
+#define BTA_GATT_INCLUDED FALSE
+#define SMP_INCLUDED FALSE
#endif
diff --git a/device-common.mk b/device-common.mk
index 89e4af1..da4a424 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -58,8 +58,7 @@
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
frameworks/native/data/etc/android.hardware.usb.host.xml:system/etc/permissions/android.hardware.usb.host.xml \
- frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
- frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml
+ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml
PRODUCT_COPY_FILES += \
device/asus/grouper/elan-touchscreen.idc:system/usr/idc/elan-touchscreen.idc \
diff --git a/kernel b/kernel
old mode 100755
new mode 100644
index 853cc8f..7bd07f1
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 19156a8..cbd5a6c 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -1 +1,4 @@
type sysfs_firmware_writable, fs_type, sysfs_type;
+
+allow sysfs_devices_tegradc sysfs:filesystem associate;
+allow sysfs_devices_system_cpu sysfs:filesystem associate;
diff --git a/sepolicy/init_shell.te b/sepolicy/init_shell.te
new file mode 100644
index 0000000..d0bbc3d
--- /dev/null
+++ b/sepolicy/init_shell.te
@@ -0,0 +1 @@
+allow init_shell sysfs_firmware_writable:file w_file_perms;
diff --git a/sepolicy/sensors_config.te b/sepolicy/sensors_config.te
index 70e683d..e948834 100644
--- a/sepolicy/sensors_config.te
+++ b/sepolicy/sensors_config.te
@@ -10,6 +10,7 @@
allow sensors_config sensors_data_file:file create_file_perms;
allow sensors_config shell_exec:file rx_file_perms;
file_type_auto_trans(sensors_config, system_data_file, sensors_data_file)
+allow sensors_config system_data_file:dir { remove_name };
# Execute toolbox commands
allow sensors_config system_file:file execute_no_trans;
diff --git a/sepolicy/shell.te b/sepolicy/shell.te
deleted file mode 100644
index 26ee654..0000000
--- a/sepolicy/shell.te
+++ /dev/null
@@ -1 +0,0 @@
-allow shell sysfs_firmware_writable:file w_file_perms;