Merge pull request #2 from mozilla-b2g/revert-1-bug-1224131

Revert "Bug 1224131 - Merge upstream policy changes r=gerard-majax"

common/file_contexts

@@ -115,7 +115,7 @@
 /system/bin/diag_socket_log                     u:object_r:diag_exec:s0
 /system/bin/diag_uart_log                       u:object_r:diag_exec:s0
 /system/bin/drmdiagapp                          u:object_r:diag_exec:s0
-/system/vendor/bin/irsc_util                    u:object_r:irsc_util_exec:s0
+/system/bin/irsc_util                           u:object_r:irsc_util_exec:s0
 /system/bin/mm-pp-daemon                        u:object_r:mm-pp-daemon_exec:s0
 /system/bin/mmi                                 u:object_r:mmi_exec:s0
 /system/bin/mpdecision                          u:object_r:mpdecision_exec:s0
@@ -125,18 +125,18 @@
 /system/bin/imsqmidaemon                        u:object_r:ims_exec:s0
 /system/bin/ims_rtp_daemon                      u:object_r:ims_exec:s0
 /system/bin/imscmservice                        u:object_r:imscm_exec:s0
-/system/vendor/bin/netmgrd                      u:object_r:netmgrd_exec:s0
-/system/vendor/bin/qmuxd                        u:object_r:qmuxd_exec:s0
+/system/bin/netmgrd                             u:object_r:netmgrd_exec:s0
+/system/bin/qmuxd                               u:object_r:qmuxd_exec:s0
 /system/bin/port-bridge                         u:object_r:port-bridge_exec:s0
-/system/vendor/bin/sensors.qcom                 u:object_r:sensors_exec:s0
+/system/bin/sensors.qcom                        u:object_r:sensors_exec:s0
 /system/bin/sns.*                               u:object_r:sensors_test_exec:s0
 /system/bin/test_diag                           u:object_r:diag_exec:s0
 /system/bin/thermal-engine                      u:object_r:thermal-engine_exec:s0
 /system/bin/vm_bms                              u:object_r:vm_bms_exec:s0
-/system/vendor/bin/mm-qcamera-daemon            u:object_r:mm-qcamerad_exec:s0
+/system/bin/mm-qcamera-daemon                   u:object_r:mm-qcamerad_exec:s0
 /system/rfs.*                                   u:object_r:rfs_system_file:s0
 /system/bin/time_daemon                         u:object_r:time_daemon_exec:s0
-/system/vendor/bin/rmt_storage                  u:object_r:rmt_storage_exec:s0
+/system/bin/rmt_storage                         u:object_r:rmt_storage_exec:s0
 /system/bin/rfs_access                          u:object_r:rfs_access_exec:s0
 /system/bin/tftp_server                         u:object_r:rfs_access_exec:s0
 /system/bin/hvdcp                               u:object_r:hvdcp_exec:s0
@@ -176,7 +176,7 @@
 /system/bin/dts_configurator                    u:object_r:dtsconfigurator_exec:s0
 /system/bin/dts_eagle_service                   u:object_r:dtseagleservice_exec:s0
 /system/vendor/bin/qti                          u:object_r:qti_exec:s0
-/system/vendor/bin/wcnss_service                u:object_r:wcnss_service_exec:s0
+/system/bin/wcnss_service                       u:object_r:wcnss_service_exec:s0
 /system/vendor/bin/hbtp_daemon                  u:object_r:hbtp_exec:s0
 /system/bin/seempd                              u:object_r:seempd_exec:s0
 /system/bin/sapd                                u:object_r:sapd_exec:s0

common/mediaserver.te

@@ -16,7 +16,6 @@ allow mediaserver camera_data_file:sock_file write;
 userdebug_or_eng(`
   allow mediaserver camera_data_file:dir rw_dir_perms;
   allow mediaserver camera_data_file:file create_file_perms;
-  allow mediaserver debugfs:file rw_file_perms;
 ')
 
 allow mediaserver sysfs_esoc:dir r_dir_perms;
@@ -46,3 +45,8 @@ allow mediaserver time_daemon:unix_stream_socket connectto;
 # Allow mediaserver to create socket files for audio arbitration
 allow mediaserver audio_data_file:sock_file { create setattr unlink };
 allow mediaserver audio_data_file:dir remove_name;
+
+#access to audio
+userdebug_or_eng('
+allow mediaserver debugfs:file rw_file_perms;
+')