Commits

Stephen Smalley  committed dccd00e Merge with conflicts

Merge branch 'master' into seandroid

Conflicts:
BoardConfig.mk
fstab.mako
sepolicy/bluetooth_loader.te
sepolicy/bridge.te
sepolicy/camera.te
sepolicy/conn_init.te
sepolicy/file.te
sepolicy/file_contexts
sepolicy/mpdecision.te
sepolicy/netmgrd.te
sepolicy/qmux.te
sepolicy/rmt.te
sepolicy/sensors.te
sepolicy/thermald.te

  • Participants
  • Parent commits 525264a, 6168600

Comments (0)

Files changed (2)

File BoardConfig.mk

        device/lge/mako/sepolicy
 
 BOARD_SEPOLICY_UNION += \
-       file_contexts \
        property_contexts \
        te_macros \
        bluetooth_loader.te \
        domain.te \
        drmserver.te \
        file.te \
-       kickstart.te \
+       file_contexts \
+       hci_init.te \
        init.te \
+       init_shell.te \
+       keystore.te \
+       kickstart.te \
        mediaserver.te \
        mpdecision.te \
        netmgrd.te \
+       nfc.te \
        property.te \
        qmux.te \
        rild.te \
 /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,context=u:object_r:radio_efs_file:s0   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
 /dev/block/platform/msm_sdcc.1/by-name/boot         /boot           emmc    defaults                                                        defaults
 /dev/block/platform/msm_sdcc.1/by-name/recovery     /recovery       emmc    defaults                                                        defaults
 /dev/block/platform/msm_sdcc.1/by-name/misc         /misc           emmc    defaults                                                        defaults