Merge "wahoo: Move genfs rfkill to system/sepolicy"
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1eb91b2..01f9c42 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -28,6 +28,8 @@
TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := cortex-a73
+BUILD_BROKEN_DUP_RULES := true
+
BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_BOOTLOADER_BOARD_NAME) androidboot.console=ttyMSM0 lpm_levels.sleep_disabled=1
BOARD_KERNEL_CMDLINE += user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3
BOARD_KERNEL_CMDLINE += service_locator.enable=1
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 63515b1..31f2222 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -22,10 +22,6 @@
#ifndef _BDROID_BUILDCFG_H
#define _BDROID_BUILDCFG_H
-// Wide-band speech support
-#define BTM_WBS_INCLUDED TRUE
-#define BTIF_HF_WBS_PREFERRED TRUE
-
// Google VSC spec support
#define BLE_VND_INCLUDED TRUE
diff --git a/init.hardware.rc b/init.hardware.rc
index 45c4c14..b8f335a 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -705,11 +705,6 @@
start ims_rtp_daemon
start imsrcsservice
-service qmuxd /vendor/bin/qmuxd
- class main
- user root
- group radio audio bluetooth gps nfc qcom_diag
-
#TODO evaluate group system once b/62571088 is resolved
service cnd /vendor/bin/cnd
class main
diff --git a/sepolicy/private/ramoops.te b/sepolicy/private/ramoops.te
index c7cea81..534fa65 100644
--- a/sepolicy/private/ramoops.te
+++ b/sepolicy/private/ramoops.te
@@ -11,6 +11,7 @@
allow ramoops toolbox_exec:file rx_file_perms;
# Set the sys.ramoops.decrypted property
+typeattribute ramoops system_writes_vendor_properties_violators;
set_prop(ramoops, ramoops_prop);
allow ramoops sysfs_pstore:file rw_file_perms;
diff --git a/sepolicy/vendor/bluetooth.te b/sepolicy/vendor/bluetooth.te
index 5a8371d..0f5673a 100644
--- a/sepolicy/vendor/bluetooth.te
+++ b/sepolicy/vendor/bluetooth.te
@@ -1,3 +1,4 @@
+typeattribute bluetooth system_writes_vendor_properties_violators;
set_prop(bluetooth, wc_prop)
# Allow access to net_admin ioctls
diff --git a/sepolicy/vendor/bug_map b/sepolicy/vendor/bug_map
index 0c86658..247386b 100644
--- a/sepolicy/vendor/bug_map
+++ b/sepolicy/vendor/bug_map
@@ -4,6 +4,7 @@
dumpstate sysfs file 77919159
hal_audio_default default_prop file 77926553
hal_audio_default priv_app fd 77926553
+hal_bluetooth_default bluetooth_data_file dir 79920182
hal_camera_default camera_vendor_data_file dir 77865891
hal_camera_default debugfs dir 77865891
hal_camera_default radio_prop file 77865891
diff --git a/sepolicy/vendor/cameraserver.te b/sepolicy/vendor/cameraserver.te
index d29d473..594f22a 100644
--- a/sepolicy/vendor/cameraserver.te
+++ b/sepolicy/vendor/cameraserver.te
@@ -1,5 +1,6 @@
allow cameraserver gpu_device:chr_file rw_file_perms;
+typeattribute cameraserver system_writes_vendor_properties_violators;
set_prop(cameraserver, camera_prop)
allow cameraserver sysfs_camera:file r_file_perms;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index e213942..1a4a37f 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -155,7 +155,6 @@
/vendor/bin/ims_rtp_daemon u:object_r:hal_imsrtp_exec:s0
/vendor/bin/ipacm u:object_r:hal_tetheroffload_default_exec:s0
/vendor/bin/ipacm-diag u:object_r:hal_tetheroffload_default_exec:s0
-/vendor/bin/qmuxd u:object_r:qmuxd_exec:s0
/vendor/bin/cnd u:object_r:cnd_exec:s0
/vendor/bin/ATFWD-daemon u:object_r:atfwd_exec:s0
/vendor/bin/easelmanagerd u:object_r:easel_exec:s0
diff --git a/sepolicy/vendor/gatekeeperd.te b/sepolicy/vendor/gatekeeperd.te
index 647ede2..e4bef11 100644
--- a/sepolicy/vendor/gatekeeperd.te
+++ b/sepolicy/vendor/gatekeeperd.te
@@ -1 +1,2 @@
+typeattribute gatekeeperd system_writes_vendor_properties_violators;
set_prop(gatekeeperd, keymaster_prop)
diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te
index dcc69ac..190a6a0 100644
--- a/sepolicy/vendor/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
@@ -4,13 +4,11 @@
vndbinder_use(hal_camera_default);
allow hal_camera_default qdisplay_service:service_manager { find };
-allow hal_camera_default hal_graphics_mapper_hwservice:hwservice_manager find;
-allow hal_camera_default hal_graphics_allocator_hwservice:hwservice_manager find;
-
+hal_client_domain(hal_camera_default, hal_graphics_allocator)
hal_client_domain(hal_camera_default, hal_configstore)
+
binder_call(hal_camera_default, hal_graphics_composer)
binder_call(hal_camera_default, system_server)
-binder_call(hal_camera_default, hal_graphics_allocator)
# For interfacing with PowerHAL and ThermalHAL
hal_client_domain(hal_camera_default, hal_power)
diff --git a/sepolicy/vendor/qmuxd.te b/sepolicy/vendor/qmuxd.te
deleted file mode 100644
index b8dc015..0000000
--- a/sepolicy/vendor/qmuxd.te
+++ /dev/null
@@ -1,5 +0,0 @@
-type qmuxd, domain;
-type qmuxd_exec, exec_type, vendor_file_type, file_type;
-
-net_domain(qmuxd)
-init_daemon_domain(qmuxd)
diff --git a/sepolicy/vendor/radio.te b/sepolicy/vendor/radio.te
index 162251f..73d9b52 100644
--- a/sepolicy/vendor/radio.te
+++ b/sepolicy/vendor/radio.te
@@ -1,4 +1,5 @@
get_prop(radio, ims_prop)
+typeattribute radio system_writes_vendor_properties_violators;
userdebug_or_eng(`set_prop(radio, tel_mon_prop)')
allow radio qmuxd_socket:dir search;
diff --git a/sepolicy/vendor/surfaceflinger.te b/sepolicy/vendor/surfaceflinger.te
index 287824b..6437fb8 100644
--- a/sepolicy/vendor/surfaceflinger.te
+++ b/sepolicy/vendor/surfaceflinger.te
@@ -2,3 +2,4 @@
dontaudit surfaceflinger vendor_file:file read;
dontaudit surfaceflinger kernel:system module_request;
allow surfaceflinger debugfs_ion:dir search;
+
diff --git a/sepolicy/vendor/system_app.te b/sepolicy/vendor/system_app.te
index 72d8cf3..6fbccc8 100644
--- a/sepolicy/vendor/system_app.te
+++ b/sepolicy/vendor/system_app.te
@@ -4,6 +4,7 @@
# Needed by Settings app's CameraHalHdrplusPreferenceController, available only on a subset of
# userdebug and eng devices
+typeattribute system_app system_writes_vendor_properties_violators;
userdebug_or_eng(`set_prop(system_app, camera_prop)')
# read regulatory info
