Merge "Camera: Correct the Heap ID used for preview buffer allocation" into jb-mr2-dev
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f835bb4..ed9f52d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -99,8 +99,11 @@
app.te \
device.te \
drmserver.te \
+ file.te \
file_contexts \
keystore.te \
+ nfc.te \
+ rild.te \
surfaceflinger.te \
system.te \
ueventd.te \
diff --git a/sepolicy/device.te b/sepolicy/device.te
index 8a27c68..f13c6f4 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -4,3 +4,5 @@
# Qualcomm Secure Execution Environment Communicator (QSEECOM) device
type qseecom_device, dev_type;
+type diag_device, dev_type;
+type bcm2079x_device, dev_type;
diff --git a/sepolicy/file.te b/sepolicy/file.te
new file mode 100644
index 0000000..7c36594
--- /dev/null
+++ b/sepolicy/file.te
@@ -0,0 +1 @@
+type qmux_socket, file_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 030b553..8e5db5c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -5,3 +5,6 @@
# Qualcomm Secure Execution Environment Communicator (QSEECOM) device
/dev/qseecom u:object_r:qseecom_device:s0
+/dev/socket/qmux_radio/* u:object_r:qmux_socket:s0
+/dev/bcm2079x-i2c u:object_r:bcm2079x_device:s0
+/dev/diag u:object_r:diag_device:s0
diff --git a/sepolicy/nfc.te b/sepolicy/nfc.te
new file mode 100644
index 0000000..593608d
--- /dev/null
+++ b/sepolicy/nfc.te
@@ -0,0 +1 @@
+allow nfc bcm2079x_device:chr_file rw_file_perms;
diff --git a/sepolicy/rild.te b/sepolicy/rild.te
new file mode 100644
index 0000000..208c6fa
--- /dev/null
+++ b/sepolicy/rild.te
@@ -0,0 +1,3 @@
+allow rild diag_device:chr_file rw_file_perms;
+allow rild qmux_socket:sock_file rw_file_perms;
+allow rild qmux_socket:dir rw_dir_perms;
diff --git a/sepolicy/system.te b/sepolicy/system.te
index 676b2c0..5d112f9 100644
--- a/sepolicy/system.te
+++ b/sepolicy/system.te
@@ -1,2 +1,3 @@
# Grant GPU access to system apps (e.g., PowerManagerService)
allow system gpu_device:chr_file rw_file_perms;
+allow system diag_device:chr_file rw_file_perms;