Merge "Create unique labels for /dev/snd/{seq,timer}"diff --git a/service.te b/service.te
index 9c8da49..8e9dd31 100644
--- a/service.te
+++ b/service.te
@@ -38,6 +38,7 @@
type contexthub_service, app_api_service, system_server_service, service_manager_type;
type IProxyService_service, app_api_service, system_server_service, service_manager_type;
type commontime_management_service, system_server_service, service_manager_type;
+type connectivity_metrics_logger_service, app_api_service, system_server_service, service_manager_type;
type connectivity_service, app_api_service, system_server_service, service_manager_type;
type connmetrics_service, system_server_service, service_manager_type;
type consumer_ir_service, app_api_service, system_server_service, service_manager_type;
@@ -122,5 +123,6 @@
type wifiscanner_service, system_api_service, system_server_service, service_manager_type;
type wifi_service, app_api_service, system_server_service, service_manager_type;
type wificond_service, system_server_service, service_manager_type;
+type wifinan_service, app_api_service, system_server_service, service_manager_type;
type window_service, system_api_service, system_server_service, service_manager_type;
type wpa_supplicant_service, system_server_service, service_manager_type;
diff --git a/service_contexts b/service_contexts
index 6111c37..9f133d4 100644
--- a/service_contexts
+++ b/service_contexts
@@ -22,6 +22,7 @@
common_time.clock u:object_r:mediaserver_service:s0
common_time.config u:object_r:mediaserver_service:s0
connectivity u:object_r:connectivity_service:s0
+connectivity_metrics_logger u:object_r:connectivity_metrics_logger_service:s0
connmetrics u:object_r:connmetrics_service:s0
consumer_ir u:object_r:consumer_ir_service:s0
content u:object_r:content_service:s0
@@ -95,7 +96,6 @@
notification u:object_r:notification_service:s0
otadexopt u:object_r:otadexopt_service:s0
package u:object_r:package_service:s0
-sec_key_att_app_id_provider u:object_r:sec_key_att_app_id_provider_service:s0
permission u:object_r:permission_service:s0
persistent_data_block u:object_r:persistent_data_block_service:s0
phone_msim u:object_r:radio_service:s0
@@ -116,6 +116,7 @@
samplingprofiler u:object_r:samplingprofiler_service:s0
scheduling_policy u:object_r:scheduling_policy_service:s0
search u:object_r:search_service:s0
+sec_key_att_app_id_provider u:object_r:sec_key_att_app_id_provider_service:s0
sensorservice u:object_r:sensorservice_service:s0
serial u:object_r:serial_service:s0
servicediscovery u:object_r:servicediscovery_service:s0
@@ -147,6 +148,7 @@
wifiscanner u:object_r:wifiscanner_service:s0
wifi u:object_r:wifi_service:s0
wificond u:object_r:wificond_service:s0
+wifinan u:object_r:wifinan_service:s0
window u:object_r:window_service:s0
wpa u:object_r:wpa_supplicant_service:s0
* u:object_r:default_android_service:s0
diff --git a/tools/checkfc.c b/tools/checkfc.c
index e7d19b0..8a28f3c 100644
--- a/tools/checkfc.c
+++ b/tools/checkfc.c
@@ -346,7 +346,7 @@
break;
case 's':
mode = filemode_service_contexts;
- backend = SELABEL_CTX_ANDROID_PROP;
+ backend = SELABEL_CTX_ANDROID_SERVICE;
break;
case 'h':
default: