summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao Wei Liew <zhaoweiliew@gmail.com>2016-08-05 23:28:34 +0800
committerZhao Wei Liew <zhaoweiliew@gmail.com>2016-08-05 23:28:52 +0800
commit091da82baf3452dee661fa35532a7af01fe1b038 (patch)
treeecf38bd0b6bedfc1dc153520b53ae674ffbd9b96
parent9d013af0422f5aeb69bfa230cc1f74cf18162ffe (diff)
downloadandroid_device_qcom_sepolicy-091da82baf3452dee661fa35532a7af01fe1b038.tar.gz
android_device_qcom_sepolicy-091da82baf3452dee661fa35532a7af01fe1b038.tar.bz2
android_device_qcom_sepolicy-091da82baf3452dee661fa35532a7af01fe1b038.zip
Revert "SElinux policy rules addition for early audio feature"
This breaks the build due to conflicting rules: libsepol.report_failure: neverallow on line 371 of external/sepolicy/app.te (or line 10634 of policy.conf) violated by allow qtimusic_app audio_prop:property_service { set }; libsepol.report_failure: neverallow on line 267 of external/sepolicy/app.te (or line 10530 of policy.conf) violated by allow qtimusic_app property_socket:sock_file { write }; Revert the patch completely since early audio is a feature only for QC's 8960 automotive platform. This reverts commit 43335cdefae071d933fb12c189cccc2ee7e833a6. Change-Id: Ia9cbe6bf55445a6d2ee9472149f6bfb5195e2bd7
-rw-r--r--msm8960/drmserver.te28
-rw-r--r--msm8960/earlyaudio.te49
-rw-r--r--msm8960/file.te2
-rwxr-xr-xmsm8960/file_contexts3
-rw-r--r--msm8960/install.te30
-rw-r--r--msm8960/mediaserver.te28
-rw-r--r--msm8960/property_contexts3
-rw-r--r--msm8960/qtimusic_app.te34
-rw-r--r--msm8960/seapp_contexts28
-rw-r--r--msm8960/system_server.te2
10 files changed, 1 insertions, 206 deletions
diff --git a/msm8960/drmserver.te b/msm8960/drmserver.te
deleted file mode 100644
index 84672e4e..00000000
--- a/msm8960/drmserver.te
+++ /dev/null
@@ -1,28 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-binder_call(drmserver, earlyaudio)
diff --git a/msm8960/earlyaudio.te b/msm8960/earlyaudio.te
deleted file mode 100644
index 1ac4fa18..00000000
--- a/msm8960/earlyaudio.te
+++ /dev/null
@@ -1,49 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type earlyaudio, domain;
-init_daemon_domain(earlyaudio)
-type earlyaudio_exec , exec_type, file_type;
-
-
-binder_use(earlyaudio)
-# set audio property
-set_prop(earlyaudio, audio_prop)
-
-#Talk to mediaserver over binder
-binder_call(earlyaudio, mediaserver)
-unix_socket_connect(earlyaudio, vold, vold)
-
-allow earlyaudio earlyaudio_data_file:dir rw_dir_perms;
-allow earlyaudio earlyaudio_data_file:file create_file_perms;
-
-allow earlyaudio media_rw_data_file:dir r_dir_perms;
-allow earlyaudio media_rw_data_file:file r_file_perms;
-allow earlyaudio mediaserver_service:service_manager find;
-allow earlyaudio storage_file:dir r_dir_perms;
-allow earlyaudio fuse:dir r_dir_perms;
-allow earlyaudio fuse:file r_file_perms;
diff --git a/msm8960/file.te b/msm8960/file.te
index 53303dc4..e8a78cc5 100644
--- a/msm8960/file.te
+++ b/msm8960/file.te
@@ -28,5 +28,3 @@
#efs file types
type efs_data_file, file_type, data_file_type;
type mpdecision_socket, file_type;
-type qtimusic_app_data_file, file_type, data_file_type;
-type earlyaudio_data_file, file_type, data_file_type;
diff --git a/msm8960/file_contexts b/msm8960/file_contexts
index 9546ce7c..ae0f939a 100755
--- a/msm8960/file_contexts
+++ b/msm8960/file_contexts
@@ -43,10 +43,9 @@
/system/bin/efks u:object_r:mdm_helper_exec:s0
/system/bin/DR_AP_Service u:object_r:location_exec:s0
/system/bin/boot u:object_r:bootanim_exec:s0
-/system/bin/earlyaudio u:object_r:earlyaudio_exec:s0
+
###################################
# Data files
#
/data/qcks(/.*)? u:object_r:efs_data_file:s0
/sys/bootkpi/marker_entry u:object_r:sys_bootkpi:s0
-/data/misc/earlyaudio(/.*)? u:object_r:earlyaudio_data_file:s0
diff --git a/msm8960/install.te b/msm8960/install.te
deleted file mode 100644
index 88d2f0f5..00000000
--- a/msm8960/install.te
+++ /dev/null
@@ -1,30 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-allow installd { qtimusic_app_data_file} :dir { create_dir_perms relabelfrom relabelto };
-allow installd { qtimusic_app_data_file} :lnk_file { create_file_perms relabelfrom relabelto };
-allow installd { qtimusic_app_data_file } :{ file sock_file fifo_file } { getattr unlink rename relabelfrom relabelto setattr };
diff --git a/msm8960/mediaserver.te b/msm8960/mediaserver.te
deleted file mode 100644
index 16f0917c..00000000
--- a/msm8960/mediaserver.te
+++ /dev/null
@@ -1,28 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-binder_call(mediaserver, earlyaudio)
diff --git a/msm8960/property_contexts b/msm8960/property_contexts
index 2c011b05..67841d9e 100644
--- a/msm8960/property_contexts
+++ b/msm8960/property_contexts
@@ -30,6 +30,3 @@ ctl.thermal-engine u:object_r:ctl_thermal-engine_prop:s0
persist.nativehmi.exit u:object_r:ctl_bootanim_prop:s0
nativehmi.appname u:object_r:ctl_bootanim_prop:s0
sys.mediaserver.ready u:object_r:audio_prop:s0
-early.audionative.id u:object_r:audio_prop:s0
-early.audio.start u:object_r:audio_prop:s0
-early.audioapp.id u:object_r:audio_prop:s0
diff --git a/msm8960/qtimusic_app.te b/msm8960/qtimusic_app.te
deleted file mode 100644
index 1a026f10..00000000
--- a/msm8960/qtimusic_app.te
+++ /dev/null
@@ -1,34 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-type qtimusic_app, domain;
-app_domain(qtimusic_app)
-allow qtimusic_app { app_api_service system_api_service mediaserver_service surfaceflinger_service } : service_manager find;
-set_prop(qtimusic_app, audio_prop)
-allow qtimusic_app earlyaudio_data_file:dir rw_dir_perms;
-allow qtimusic_app earlyaudio_data_file:file create_file_perms;
-binder_call(qtimusic_app, mediaserver)
diff --git a/msm8960/seapp_contexts b/msm8960/seapp_contexts
deleted file mode 100644
index 48c44f24..00000000
--- a/msm8960/seapp_contexts
+++ /dev/null
@@ -1,28 +0,0 @@
-#Copyright (c) 2015, The Linux Foundation. All rights reserved.
-
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-
-#THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-#WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-#BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-#BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-#OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-#IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-user=system seinfo=platform name=com.qualcomm.qti.esg.auto.demo.music.allplay.phoneplayer domain=qtimusic_app type=qtimusic_app_data_file
diff --git a/msm8960/system_server.te b/msm8960/system_server.te
index e8259268..0185b373 100644
--- a/msm8960/system_server.te
+++ b/msm8960/system_server.te
@@ -3,5 +3,3 @@ allow system_server init:unix_dgram_socket sendto;
#For gss
allow system_server gss_device:chr_file rw_file_perms;
-allow system_server qtimusic_app_data_file:file rw_file_perms;
-allow system_server qtimusic_app_data_file:dir r_dir_perms;