Commits

Stephen Smalley  committed 990435d Merge with conflicts

Merge branch 'master' into seandroid

Conflicts:
init.mako.rc
sepolicy/file_contexts

  • Participants
  • Parent commits c3b6999, c09e839

Comments (0)

Files changed (2)

File init.mako.rc

 
 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
+    restorecon_recursive /persist
     setprop ro.crypto.fuse_sdcard true
     write /sys/kernel/boot_adsp/boot 1
 

File sepolicy/file_contexts

-/dev/msm_acdb                  u:object_r:audio_device:s0
-/dev/msm_mp3                   u:object_r:audio_device:s0
-/dev/msm_rtac                  u:object_r:audio_device:s0
-/dev/msm_vidc.*                u:object_r:audio_device:s0
-/dev/msm_amrnb.*               u:object_r:audio_device:s0
-/dev/msm_amrwb.*               u:object_r:audio_device:s0
-/dev/msm_aac.*                 u:object_r:audio_device:s0
+# GPU device (world r/w)
+/dev/kgsl-3d0                  u:object_r:kgsl_device:s0
+/dev/kgsl                      u:object_r:kgsl_device:s0
 
 # Image Rotator Driver
 /dev/msm_rotator    u:object_r:video_device:s0
 /dev/bcm2079x-i2c                  u:object_r:nfc_device:s0
 /dev/diag                          u:object_r:diag_device:s0
 
+/dev/cpu_dma_latency           u:object_r:power_control_device:s0
+/dev/smem_log                  u:object_r:shared_log_device:s0
+
+# Block labeling
+/dev/block/mmcblk0p[89]        u:object_r:efs_block_device:s0
+
 # CPU governor controls
 /dev/socket/mpdecision(/.*)?           u:object_r:mpdecision_socket:s0
 
 /dev/ttyHS0                            u:object_r:hci_attach_dev:s0
 /dev/ttyMSM0                           u:object_r:hci_attach_dev:s0
 
-# Jpeg Engine support
-/dev/gemini.*                  u:object_r:camera_device:s0
-# MSM camera related
-/dev/v4l-subdev.*              u:object_r:camera_device:s0
-/dev/video.*                   u:object_r:camera_device:s0
-/dev/msm_camera.*              u:object_r:camera_device:s0
-
-# Media interface
-/dev/media.*                   u:object_r:video_device:s0
-
-# Sensors DSPS driver
-/dev/msm_dsps                  u:object_r:sensors_device:s0
-/dev/smd_sns_dsps              u:object_r:sensors_device:s0
-
+# Radio interface
 /dev/ttyUSB0                   u:object_r:radio_device:s0
 
-/dev/cpu_dma_latency           u:object_r:power_control_device:s0
-/dev/ks_hsic_bridge            u:object_r:kickstart_device:s0
-/dev/efs_hsic_bridge           u:object_r:kickstart_device:s0
-/dev/smem_log                  u:object_r:shared_log_device:s0
-/dev/kgsl-3d0                  u:object_r:kgsl_device:s0
-/dev/kgsl                      u:object_r:kgsl_device:s0
+# Jpeg Engine support
+/dev/gemini.*                          u:object_r:camera_device:s0
+# MSM camera related
+/dev/v4l-subdev.*                      u:object_r:camera_device:s0
+/dev/video([0-9])+                     u:object_r:camera_device:s0
+/dev/msm_camera(/.*)?                  u:object_r:camera_device:s0
+/dev/media([0-9])+                     u:object_r:camera_device:s0
+
+# Qualcomm MSM Audio devices
+/dev/msm_acdb                      u:object_r:audio_device:s0
+/dev/msm_mp3                       u:object_r:audio_device:s0
+/dev/msm_rtac                      u:object_r:audio_device:s0
+/dev/msm_vidc.*                    u:object_r:audio_device:s0
+/dev/msm_amrnb.*                   u:object_r:audio_device:s0
+/dev/msm_amrwb.*                   u:object_r:audio_device:s0
+/dev/msm_aac.*                     u:object_r:audio_device:s0
+
+# MSM Dedicated Sensors Processor Subsystem
+/dev/msm_dsps                          u:object_r:sensors_device:s0
+# Sensors shared Memory Packet Interface
+/dev/smd_sns_dsps                      u:object_r:sensors_device:s0
+
+/dev/ks_hsic_bridge                u:object_r:kickstart_device:s0
+/dev/efs_hsic_bridge               u:object_r:kickstart_device:s0
 
-# Block labeling
-/dev/block/mmcblk0p[89]        u:object_r:efs_block_device:s0
+# System binaries
+/system/bin/efsks                u:object_r:kickstart_exec:s0
+/system/bin/ks                   u:object_r:kickstart_exec:s0
+/system/bin/qcks                 u:object_r:kickstart_exec:s0
+/system/etc/kickstart_checker.sh u:object_r:kickstart_exec:s0
+/system/bin/hci_qcomm_init       u:object_r:hci_attach_exec:s0
+/system/bin/bdAddrLoader           u:object_r:bluetooth_loader_exec:s0
+/system/etc/init.mako.bt.sh        u:object_r:bluetooth_loader_exec:s0
+/system/bin/rmt_storage            u:object_r:rmt_exec:s0
+/system/bin/bridgemgrd             u:object_r:bridge_exec:s0
+/system/bin/qmuxd                  u:object_r:qmux_exec:s0
+/system/bin/netmgrd                u:object_r:netmgrd_exec:s0
+/system/bin/thermald               u:object_r:thermald_exec:s0
+/system/bin/mpdecision             u:object_r:mpdecision_exec:s0
+/system/bin/sensors.qcom           u:object_r:sensors_exec:s0
+/system/bin/mm-qcamera-daemon      u:object_r:camera_exec:s0
+/system/bin/qseecomd               u:object_r:tee_exec:s0
+/system/bin/conn_init              u:object_r:conn_init_exec:s0
 
 # Data labeling
 /data/audio(/.*)?              u:object_r:audio_firmware_file:s0
 /data/misc/tzapps(/.*)?        u:object_r:tee_data_file:s0
 /data/system/sensors(/.*)?     u:object_r:sensors_data_file:s0
 
-# System binaries
-/system/bin/rmt_storage          u:object_r:rmt_exec:s0
-/system/bin/thermald             u:object_r:thermald_exec:s0
-/system/bin/mpdecision           u:object_r:mpdecision_exec:s0
-/system/bin/mm-qcamera-daemon    u:object_r:camera_exec:s0
-/system/bin/sensors.qcom         u:object_r:sensors_exec:s0
-/system/bin/qmuxd                u:object_r:qmux_exec:s0
-/system/bin/bridgemgrd           u:object_r:bridge_exec:s0
-/system/bin/netmgrd              u:object_r:netmgrd_exec:s0
-/system/bin/qseecomd             u:object_r:tee_exec:s0
-/system/bin/conn_init            u:object_r:conn_init_exec:s0
-/system/bin/efsks                u:object_r:kickstart_exec:s0
-/system/bin/ks                   u:object_r:kickstart_exec:s0
-/system/bin/qcks                 u:object_r:kickstart_exec:s0
-/system/etc/kickstart_checker.sh u:object_r:kickstart_exec:s0
-/system/bin/hci_qcomm_init       u:object_r:hci_attach_exec:s0
-/system/etc/init.mako.bt.sh      u:object_r:bluetooth_loader_exec:s0
-/system/bin/bdAddrLoader         u:object_r:bluetooth_loader_exec:s0
-
 # Persist firmware filesystem
 /persist(/.*)?                   u:object_r:persist_file:s0
 /persist/bluetooth(/.*)?         u:object_r:persist_bluetooth_file:s0