summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio_policy.conf4
-rw-r--r--init.shamu.rc17
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml2
-rw-r--r--sec_config7
-rw-r--r--sepolicy/file.te2
-rw-r--r--sepolicy/file_contexts4
-rw-r--r--sepolicy/netmgrd.te3
-rw-r--r--sepolicy/radio.te3
8 files changed, 39 insertions, 3 deletions
diff --git a/audio_policy.conf b/audio_policy.conf
index f3fb2e79..b32d5941 100644
--- a/audio_policy.conf
+++ b/audio_policy.conf
@@ -84,8 +84,8 @@ audio_hw_modules {
inputs {
usb_device {
sampling_rates dynamic
- channel_masks AUDIO_CHANNEL_IN_STEREO
- formats AUDIO_FORMAT_PCM_16_BIT
+ channel_masks dynamic
+ formats dynamic
devices AUDIO_DEVICE_IN_USB_DEVICE
}
}
diff --git a/init.shamu.rc b/init.shamu.rc
index c835b3e4..45ca1d41 100644
--- a/init.shamu.rc
+++ b/init.shamu.rc
@@ -375,6 +375,23 @@ service netmgrd /system/bin/netmgrd
class main
group radio
+service imsqmidaemon /system/bin/imsqmidaemon
+ class main
+ user system
+ socket ims_qmid stream 0660 system radio
+ group radio log
+
+# TODO: remove net_raw and net_admin and add them to android_filesystem_config.h
+service imsdatadaemon /system/bin/imsdatadaemon
+ class main
+ user system
+ socket ims_datad stream 0660 system radio
+ group system wifi radio inet net_raw log net_admin
+ disabled
+
+on property:sys.ims.QMI_DAEMON_STATUS=1
+ start imsdatadaemon
+
service sensors /system/bin/sensors.qcom
class core
user root
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 6c4a6d96..b30660aa 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -271,7 +271,7 @@
<bool name="config_hotswapCapable">true</bool>
<!-- Flag specifying whether VoLTE & VT is availasble on device -->
- <bool name="config_device_volte_vt_available">false</bool>
+ <bool name="config_device_volte_vt_available">true</bool>
<!-- Configure mobile tcp buffer sizes in the form:
rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
diff --git a/sec_config b/sec_config
index eea4fa2d..56025570 100644
--- a/sec_config
+++ b/sec_config
@@ -2,5 +2,12 @@
/* <GPS QMI Service ID - 16>:<GPS QMI Instance ID - all instances>:<Client Group ID> */
16:4294967295:1000:3004
501:4294967295:1001
+/* Allow QMID service to aquire net_raw permission */
+3:4294967295:1001:3004
+2:4294967295:1001:3004
+42:4294967295:1001:3004
+18:4294967295:1001:3004
+9:4294967295:1001:3004
+1:4294967295:1001:3004
/* Allow MOTEX service to be used by radio processes and net_raw processes */
228:4294967295:1001:3004
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 894fe472..ddd1afa9 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -8,6 +8,8 @@ type mpdecision_socket, file_type;
type qmuxd_socket, file_type;
type sensors_socket, file_type;
type thermald_socket, file_type;
+# Socket node needed by ims_data daemon
+type ims_socket, file_type;
type diag_logs, file_type, data_file_type;
type ram_dump_logs, file_type, data_file_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index a7d83559..82e23de3 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -76,6 +76,10 @@
/dev/socket/sensor_ctl_socket u:object_r:sensors_socket:s0
/dev/socket/mpdecision(/.*)? u:object_r:mpdecision_socket:s0
+#Add context for IMS Socket node
+/dev/socket/ims_qmid u:object_r:ims_socket:s0
+/dev/socket/ims_datad u:object_r:ims_socket:s0
+
# Shared memory log
/dev/smem_log u:object_r:shared_log_device:s0
diff --git a/sepolicy/netmgrd.te b/sepolicy/netmgrd.te
index 2bacdda0..2a534404 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/netmgrd.te
@@ -38,3 +38,6 @@ dontaudit netmgrd self:capability sys_module;
# Set net_radio properties
unix_socket_connect(netmgrd, property, init)
allow netmgrd net_radio_prop:property_service set;
+
+# Permission to run netd commands
+allow netmgrd netd_socket:sock_file write;
diff --git a/sepolicy/radio.te b/sepolicy/radio.te
index 2d8e62fc..84a6c89f 100644
--- a/sepolicy/radio.te
+++ b/sepolicy/radio.te
@@ -3,3 +3,6 @@ qmux_socket(radio)
# Grant access to qmux socket that is created by rild
allow radio rild_qmuxd_socket:sock_file rw_file_perms;
+
+# Grant access to ims socket that is created by ims_qmid, ims_datad
+allow radio ims_socket:sock_file write;