Merge "Enable qcril db in angler"

5 files changed, 40 insertions, 0 deletions

diff --git a/device.mk b/device.mk
index 37aa847..411387f 100644
--- a/device.mk
+++ b/device.mk
@@ -53,6 +53,9 @@ endif
 PRODUCT_COPY_FILES += \
     device/huawei/angler/init.mcfg.sh:system/bin/init.mcfg.sh
 
+PRODUCT_COPY_FILES += \
+    device/huawei/angler/init.radio.sh:system/bin/init.radio.sh
+
 # Thermal configuration
 PRODUCT_COPY_FILES += \
     device/huawei/angler/thermal-engine-angler.conf:system/etc/thermal-engine.conf
diff --git a/init.angler.rc b/init.angler.rc
index afa73e0..b615f28 100755
--- a/init.angler.rc
+++ b/init.angler.rc
@@ -231,6 +231,14 @@ on post-fs-data
     chmod 0440 /persist/data/st_offset
     chmod 0440 /persist/data/st_xtalk
 
+    # File flags for prebuilt ril db file
+    write /data/misc/radio/prebuilt_db_support 1
+    chown radio radio /data/misc/radio/prebuilt_db_support
+    chmod 0400 /data/misc/radio/prebuilt_db_support
+    write /data/misc/radio/db_check_done 0
+    chown radio radio /data/misc/radio/db_check_done
+    chmod 0660 /data/misc/radio/db_check_done
+
     chown system system /sys/class/kgsl/kgsl-3d0/devfreq/max_freq
     chmod 0660 /sys/class/kgsl/kgsl-3d0/devfreq/max_freq
     chown system system /sys/class/kgsl/kgsl-3d0/devfreq/min_freq
@@ -468,6 +476,12 @@ service mcfg-sh /system/bin/init.mcfg.sh
    group radio system
    oneshot
 
+service radio-sh /system/bin/init.radio.sh
+    class late_start
+    user radio
+    group root radio
+    oneshot
+
 service oem_qmi_server /vendor/bin/oem_qmi_server
     class main
     user root
diff --git a/init.radio.sh b/init.radio.sh
new file mode 100755
index 0000000..8d687a1
--- /dev/null
+++ b/init.radio.sh
@@ -0,0 +1,10 @@
+#!/system/bin/sh
+
+#
+# Copy qcril.db if needed for RIL
+#
+if [ -f /vendor/qcril.db -a ! -f /data/misc/radio/qcril.db ]; then
+    cp /vendor/qcril.db /data/misc/radio/qcril.db
+    chown -h radio.radio /data/misc/radio/qcril.db
+fi
+echo 1 > /data/misc/radio/db_check_done
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index bf39d52..ad4c871 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -130,6 +130,7 @@
 /system/bin/init\.qcom\.devstart\.sh     u:object_r:init-qcom-devstart-sh_exec:s0
 /system/bin/init\.qcom\.devwait\.sh      u:object_r:init-qcom-devwait-sh_exec:s0
 /system/bin/init\.mcfg\.sh               u:object_r:init-mcfg-sh_exec:s0
+/system/bin/init\.radio\.sh              u:object_r:init-radio-sh_exec:s0
 /vendor/bin/irsc_util                    u:object_r:irsc_util_exec:s0
 /vendor/bin/loc_launcher                 u:object_r:location_exec:s0
 /system/bin/location-mq                  u:object_r:location_exec:s0
diff --git a/sepolicy/init-radio-sh.te b/sepolicy/init-radio-sh.te
new file mode 100644
index 0000000..daa70c4
--- /dev/null
+++ b/sepolicy/init-radio-sh.te
@@ -0,0 +1,12 @@
+# /system/bin/init.radio.sh
+type init-radio-sh, domain;
+type init-radio-sh_exec, exec_type, file_type;
+
+init_daemon_domain(init-radio-sh)
+
+allow init-radio-sh shell_exec:file rx_file_perms;
+
+allow init-radio-sh toolbox_exec:file rx_file_perms;
+
+allow init-radio-sh radio_data_file:dir rw_dir_perms;
+allow init-radio-sh radio_data_file:file create_file_perms;