Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I8dbb751759f10ec2d0dc69bd2e12104df939da83
diff --git a/init.tuna.rc b/init.tuna.rc
index 45e6444..3105d2f 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -30,6 +30,7 @@
# camera calibration
mkdir /data/misc/camera 0770 media media
mkdir /data/misc/camera/R5_MVEN003_LD2_ND0_IR0_SH0_FL1_SVEN003_DCCID1044 0770 media media
+ restorecon /data/misc/camera
mkdir /data/radio 0775 radio radio
mkdir /data/radio/log 0775 radio radio
@@ -109,6 +110,8 @@
chmod 0660 /sys/class/rfkill/rfkill0/state
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state
chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type
+ restorecon /sys/class/rfkill/rfkill0/state
+ restorecon /sys/class/rfkill/rfkill0/type
# backlight
chown system system /sys/class/backlight/s6e8aa0/brightness
diff --git a/libsensors/Android.mk b/libsensors/Android.mk
index 6cf59a7..8a25c2c 100644
--- a/libsensors/Android.mk
+++ b/libsensors/Android.mk
@@ -26,7 +26,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\"
-LOCAL_C_INCLUDES += hardware/invensense/libsensors
+LOCAL_C_INCLUDES += hardware/invensense/libsensors hardware/invensense/60xx/libsensors
LOCAL_SRC_FILES := \
sensors.cpp \
InputEventReader.cpp \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 58a6238..f982cd6 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -6,6 +6,7 @@
/dev/cdma_.* u:object_r:radio_device:s0
/dev/lte_.* u:object_r:radio_device:s0
/dev/tiler u:object_r:video_device:s0
+/dev/timerirq u:object_r:sensors_device:s0
/dev/ttyFIQ0 u:object_r:console_device:s0
/dev/ttyGS0 u:object_r:radio_device:s0
/dev/ttyGS1 u:object_r:radio_device:s0
