Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8022c32b authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge branch 'seandroid-4.2' into cm-10.1

Change-Id: I86acb72972f79f502b22c6e094c144645cf39228
parents c5dd5a60 a89e0360
Loading
Loading
Loading
Loading
+33 −0
Original line number Diff line number Diff line
@@ -108,3 +108,36 @@ BOARD_HAVE_LOW_LATENCY_AUDIO := true
-include vendor/lge/mako/BoardConfigVendor.mk

BOARD_HAS_NO_SELECT_BUTTON := true

BOARD_SEPOLICY_DIRS += \
        device/lge/mako/sepolicy

BOARD_SEPOLICY_UNION += \
	file_contexts \
	property_contexts \
	te_macros \
	bluetooth_loader.te \
	bridge.te \
	camera.te \
	conn_init.te \
	device.te \
	dhcp.te \
	domain.te \
	drmserver.te \
	file.te \
	kickstart.te \
	init.te \
	mediaserver.te \
	mpdecision.te \
	netmgrd.te \
	property.te \
	qmux.te \
	rild.te \
	rmt.te \
	sensors.te \
	surfaceflinger.te \
	system.te \
	tee.te \
	thermald.te \
	ueventd.te \
	wpa_supplicant.te

WCNSS_qcom_wlan_nv.bin

100755 → 100644
(29.1 KiB)

File changed.File mode changed from 100755 to 100644.

No diff preview for this file type.

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@
/dev/block/platform/msm_sdcc.1/by-name/cache        /cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
/dev/block/platform/msm_sdcc.1/by-name/userdata     /data           ext4    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/metadata
/dev/block/platform/msm_sdcc.1/by-name/persist      /persist        ext4    nosuid,nodev,barrier=1,data=ordered,nodelalloc                  wait
/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware       vfat    ro,uid=1000,gid=1000,dmask=227,fmask=337                        wait
/dev/block/platform/msm_sdcc.1/by-name/modem        /firmware       vfat    ro,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:radio_efs_file:s0  wait
+27 −3
Original line number Diff line number Diff line
@@ -44,12 +44,28 @@ on init
    # the MCC. This is needed by RIL.
    setprop persist.radio.custom_ecc "1"
    setprop persist.radio.custom_ecc_mcc "{234,235,424,426,427,430,431:999},{334:060,066},{422:9999},{730:133}"
    setprop persist.radio.custom_ecc_mcc_ex "{450:111,112,113,119,122,125,127},{724:190}"
    setprop persist.radio.custom_ecc_mcc_ex "{450:111,112,113,119,122,125,127},{724:190},{440,441:110,118,119,112,911}"
    setprop persist.radio.custom_ecc_voice "{515:117},{452:113,114,115}"
    setprop persist.radio.custom_ecc_hard "911,*911,#911,112,999,000,08,118,120,122,110,119,995,111,113,125,127,133"

on fs
    mount_all ./fstab.mako
    restorecon /persist
    restorecon /persist/bluetooth
    restorecon /persist/bluetooth/.bdaddr
    restorecon /persist/playready
    restorecon /persist/playready/dxhdcp2
    restorecon /persist/playready/dxhdcp2/acGSIRU1TX-2o-nJ69e1aFGgUxE_
    restorecon /persist/playready/dxhdcp2/acGSIRU1TX-2o-nJ69e1aFGgUxE_/etK7oituoft7bxrO5H7GIVuhEQM_
    restorecon /persist/playready/dxhdcp2/acGSIRU1TX-2o-nJ69e1aFGgUxE_/zttE+GVYd9YzREzMHiKY-IlERZM_
    restorecon /persist/sensors
    restorecon /persist/sensors/sns.reg
    restorecon /persist/widevine
    restorecon /persist/widevine/5dsokxEEDXgQhkN50bp-Z2K5InM_
    restorecon /persist/widevine/5dsokxEEDXgQhkN50bp-Z2K5InM_/RXFABDUxyT6Q+Zwx9ZhPGOq2Bq8_
    restorecon /persist/widevine/5dsokxEEDXgQhkN50bp-Z2K5InM_/D3qpp0bxmJhbiZwIsCbXJ1434rc_
    restorecon /persist/wifi
    restorecon /persist/wifi/.macaddr
    setprop ro.crypto.fuse_sdcard true

on early-boot
@@ -146,6 +162,11 @@ on post-fs-data
# to observe dnsmasq.leases file for dhcp information of soft ap.
    chown dhcp system /data/misc/dhcp

    mkdir /data/misc/playready
    restorecon /data/misc/playready
    mkdir /data/misc/tzapps
    restorecon /data/misc/tzapps

    write /dev/wcnss_wlan 1
    write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1

@@ -178,6 +199,7 @@ on post-fs-data
    mkdir /data/system/sensors
    chmod 665 /data/system/sensors
    write /data/system/sensors/settings 1
    restorecon /data/system/sensors/settings
    chmod 660 /data/system/sensors/settings

    # AKM setting data
@@ -273,6 +295,7 @@ service hciattach /system/bin/sh /system/etc/init.mako.bt.sh
    class late_start
    user bluetooth
    group qcom_oncrpc bluetooth net_bt_admin system
    seclabel u:r:bluetooth_loader:s0
    disabled
    oneshot

@@ -295,6 +318,7 @@ service qmuxd /system/bin/qmuxd

service ks_checker /system/bin/sh /system/etc/kickstart_checker.sh
    class core
    seclabel u:r:kickstart:s0
    oneshot

service kickstart /system/bin/qcks -i /firmware/image/ -r /data/tombstones/mdm/
@@ -324,7 +348,7 @@ service wpa_supplicant /system/bin/logwrapper /system/bin/wpa_supplicant \
    #   user wifi
    #   group wifi inet keystore
    class main
    socket wpa_wlan0 dgram 660 wifi wifi
    socket wpa_wlan0 dgram 660 wifi wifi u:object_r:wpa_socket:s0
    disabled
    oneshot

@@ -337,7 +361,7 @@ service p2p_supplicant /system/bin/logwrapper /system/bin/wpa_supplicant \
#   user wifi
#   group wifi inet keystore
    class main
    socket wpa_wlan0 dgram 660 wifi wifi
    socket wpa_wlan0 dgram 660 wifi wifi u:object_r:wpa_socket:s0
    disabled
    oneshot

+35 −0
Original line number Diff line number Diff line
# Bluetooth executables and script (bdAddrLoader, init.mako.bt.sh)
type bluetooth_loader, domain;
type bluetooth_loader_exec, exec_type, file_type;

# Start bdAddrLoader from init
init_daemon_domain(bluetooth_loader)

# Run init.mako.bt.sh
allow bluetooth_loader shell_exec:file { entrypoint read };
allow bluetooth_loader bluetooth_loader_exec:file { getattr open execute_no_trans };

# init.mako.bt.sh needs /system/bin/log access
allow bluetooth_loader devpts:chr_file rw_file_perms;

# Run hci_qcomm_init from init.mako.bt.sh
domain_auto_trans(bluetooth_loader, hci_attach_exec, hci_attach)

# hci_qcomm_init started with logwrapper
allow hci_attach devpts:chr_file rw_file_perms;
allow hci_attach bluetooth_loader:fd use;

# Read mac address from persist partition
allow bluetooth_loader persist_file:dir search;
r_dir_file(bluetooth_loader, persist_bluetooth_file)

# Talk to init over the property socket
unix_socket_connect(bluetooth_loader, property, init)
# Set persist.service.bdroid.* and bluetooth.* property values
allow { bluetooth bluetooth_loader } bluetooth_prop:property_service set;

# Shared memory node access
allow hci_attach bluetooth_device:chr_file rw_file_perms;

# Allow getprop/setprop for init.mako.bt.sh
allow bluetooth_loader system_file:file execute_no_trans;
Loading