[WIFICOND] Rename service to nl80211
Per API council feedback.
Bug: 149105833
Bug: 148680192
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Test: manual - flash/boot - verify Wi-Fi scan/associate
Change-Id: Idaf7603d4ab79ddde5c223097ed9fe8734299eea
diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil
index 60e6fb1..5231498 100644
--- a/private/compat/29.0/29.0.cil
+++ b/private/compat/29.0/29.0.cil
@@ -7,6 +7,7 @@
(type perfprofd_data_file)
(type perfprofd_service)
(type sysfs_mac_address)
+(type wificond_service)
(expandtypeattribute (accessibility_service_29_0) true)
(expandtypeattribute (account_service_29_0) true)
@@ -1949,7 +1950,7 @@
(typeattributeset wifiaware_service_29_0 (wifiaware_service))
(typeattributeset wificond_29_0 (wificond))
(typeattributeset wificond_exec_29_0 (wificond_exec))
-(typeattributeset wificond_service_29_0 (wificond_service))
+(typeattributeset wificond_service_29_0 (wificond_service wifinl80211_service))
(typeattributeset wifi_data_file_29_0 (wifi_data_file))
(typeattributeset wifi_log_prop_29_0 (wifi_log_prop))
(typeattributeset wifip2p_service_29_0 (wifip2p_service))
diff --git a/private/service_contexts b/private/service_contexts
index 19d3b0d..7561064 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -239,7 +239,7 @@
wifip2p u:object_r:wifip2p_service:s0
wifiscanner u:object_r:wifiscanner_service:s0
wifi u:object_r:wifi_service:s0
-wificond u:object_r:wificond_service:s0
+wifinl80211 u:object_r:wifinl80211_service:s0
wifiaware u:object_r:wifiaware_service:s0
wifirtt u:object_r:rttmanager_service:s0
window u:object_r:window_service:s0
diff --git a/private/system_server.te b/private/system_server.te
index 4e543ae..e7ecc79 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -764,7 +764,7 @@
allow system_server surfaceflinger_service:service_manager find;
allow system_server update_engine_service:service_manager find;
allow system_server vold_service:service_manager find;
-allow system_server wificond_service:service_manager find;
+allow system_server wifinl80211_service:service_manager find;
add_service(system_server, batteryproperties_service)
diff --git a/public/service.te b/public/service.te
index 79cce0e..a8d97f2 100644
--- a/public/service.te
+++ b/public/service.te
@@ -195,7 +195,7 @@
type wifip2p_service, app_api_service, system_server_service, service_manager_type;
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, service_manager_type;
+type wifinl80211_service, service_manager_type;
type wifiaware_service, app_api_service, system_server_service, service_manager_type;
type window_service, system_api_service, system_server_service, service_manager_type;
type inputflinger_service, system_api_service, system_server_service, service_manager_type;
diff --git a/public/wificond.te b/public/wificond.te
index af29511..b429884 100644
--- a/public/wificond.te
+++ b/public/wificond.te
@@ -6,7 +6,7 @@
binder_call(wificond, system_server)
binder_call(wificond, keystore)
-add_service(wificond, wificond_service)
+add_service(wificond, wifinl80211_service)
set_prop(wificond, exported_wifi_prop)
set_prop(wificond, wifi_prop)