diff options
| author | Nick Kralevich <nnk@google.com> | 2015-04-02 00:28:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-02 00:28:20 +0000 |
| commit | 1d1ea49bcaab60874d2766a35bf7bbd1bb73c438 (patch) | |
| tree | e3c968077df4781b4513d0c4f64bf2676e2981d0 | |
| parent | 70af57379988212785d70a7c3f9ce4c397513d49 (diff) | |
| parent | 2a17be346d3630ccef509ce2358931b743b7c3bb (diff) | |
| download | deb-1d1ea49bcaab60874d2766a35bf7bbd1bb73c438.tar.gz | |
Merge "deb: misc SELinux changes."android-wear-5.1.1_r1android-wear-5.1.0_r1master-soong
| -rw-r--r-- | device.mk | 4 | ||||
| -rw-r--r-- | init.deb.rc | 9 |
2 files changed, 3 insertions, 10 deletions
@@ -34,10 +34,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ persist.radio.apm_sim_not_pwdn=1 -#Stop rild if non 3G SKU -PRODUCT_PACKAGES += \ - init.qcom.class_main.sh - PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ rild.libpath=/system/lib/libril-qc-qmi-1.so diff --git a/init.deb.rc b/init.deb.rc index 65cf477..f30722e 100644 --- a/init.deb.rc +++ b/init.deb.rc @@ -281,11 +281,10 @@ service rmt_storage /system/bin/rmt_storage user root group system -service hciattach /system/bin/sh /system/etc/init.flo.bt.sh +service hciattach /system/bin/init.flo.bt.sh class late_start user bluetooth group qcom_oncrpc bluetooth net_bt_admin system net_bt_stack - seclabel u:r:bluetooth_loader:s0 disabled oneshot @@ -306,10 +305,9 @@ service qmuxd /system/bin/qmuxd user radio group radio audio bluetooth gps net_bt_stack -service ks_checker /system/bin/sh /system/etc/kickstart_checker.sh +service ks_checker /system/bin/kickstart_checker.sh class core group system - seclabel u:r:kickstart:s0 oneshot service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/ @@ -434,11 +432,10 @@ service qcamerasvr /system/bin/mm-qcamera-daemon user camera group camera system inet input -service wcnss_init /system/bin/sh /system/etc/init.flo.wifi.sh +service wcnss_init /system/bin/init.flo.wifi.sh class late_start user system group system wifi - seclabel u:r:conn_init:s0 oneshot service bdAddrLoader /system/bin/bdAddrLoader -f /persist/bluetooth/.bdaddr -h -x |