summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-05-30 19:01:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-30 19:01:29 +0000
commitf3cf895319941d13b488b4f37de30c9c83b2adb0 (patch)
tree7b1ac8bb06ea139307869f5a94130626d2608851
parent374966fe3630befa25f7e96a526a9ca4781b16c4 (diff)
parent01902a06526bdc737b5c36e917fa5cab70b36763 (diff)
downloadflo-f3cf895319941d13b488b4f37de30c9c83b2adb0.tar.gz
am 01902a06: am 45248675: am 7d491eeb: Merge "Drop ppd selinux policy."
* commit '01902a06526bdc737b5c36e917fa5cab70b36763': Drop ppd selinux policy.
-rwxr-xr-xBoardConfigCommon.mk1
-rw-r--r--init.flo.rc13
-rw-r--r--sepolicy/file.te1
-rw-r--r--sepolicy/file_contexts4
-rw-r--r--sepolicy/ppd.te11
-rw-r--r--sepolicy/surfaceflinger.te1
6 files changed, 0 insertions, 31 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 05697f7..c75d677 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -119,7 +119,6 @@ BOARD_SEPOLICY_UNION += \
mediaserver.te \
mpdecision.te \
netmgrd.te \
- ppd.te \
qmux.te \
rild.te \
rmt.te \
diff --git a/init.flo.rc b/init.flo.rc
index dee4c36..e3c711d 100644
--- a/init.flo.rc
+++ b/init.flo.rc
@@ -438,13 +438,6 @@ service mpdecision /system/bin/mpdecision --no_sleep --avg_comp
user root
group root system
-service ppd /system/bin/mm-pp-daemon
- class late_start
- disabled
- user system
- socket pps stream 0660 system system
- group system graphics
-
service qcamerasvr /system/bin/mm-qcamera-daemon
class late_start
user camera
@@ -492,9 +485,3 @@ on property:ro.boot.baseband=mdm
on property:ro.boot.baseband=apq
setprop ro.radio.noril yes
stop ril-daemon
-
-on property:init.svc.surfaceflinger=running
- start ppd
-
-on property:init.svc.surfaceflinger=stopped
- stop ppd
diff --git a/sepolicy/file.te b/sepolicy/file.te
index 38285da..37736fc 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -2,7 +2,6 @@
type qmuxd_socket, file_type;
type sensors_socket, file_type;
type camera_socket, file_type;
-type ppd_socket, file_type;
type sensors_data_file, file_type, data_file_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 9d05bba..8a0dc09 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -35,9 +35,6 @@
# CPU governor controls
/dev/socket/mpdecision(/.*)? u:object_r:mpdecision_socket:s0
-# HDMI output socket (mm-pp-daemon)
-/dev/socket/pps u:object_r:ppd_socket:s0
-
## Radio related
# modem driver
/dev/mdm u:object_r:radio_device:s0
@@ -121,7 +118,6 @@
/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
-/system/bin/mm-pp-daemon u:object_r:ppd_exec:s0
/system/bin/irsc_util u:object_r:irsc_util_exec:s0
# Persist firmware filesystem
diff --git a/sepolicy/ppd.te b/sepolicy/ppd.te
deleted file mode 100644
index 1b37ec8..0000000
--- a/sepolicy/ppd.te
+++ /dev/null
@@ -1,11 +0,0 @@
-# HDMI output (system process)
-type ppd, domain;
-type ppd_exec, exec_type, file_type;
-
-# Started by init
-init_daemon_domain(ppd)
-
-permissive_or_unconfined(ppd)
-
-allow ppd graphics_device:chr_file rw_file_perms;
-unix_socket_connect(ppd, property, init)
diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te
index db248db..6d10487 100644
--- a/sepolicy/surfaceflinger.te
+++ b/sepolicy/surfaceflinger.te
@@ -1,2 +1 @@
allow surfaceflinger sysfs_surfaceflinger:file rw_file_perms;
-unix_socket_connect(surfaceflinger, ppd, ppd)