Merge changes from topic "b80319537"

* changes:
  hal_attribute_hwservice_client drop '_client'
  hal_attribute_hwservice_client += add_hwservice

public/hal_weaver.te

 # HwBinder IPC from client to server
 binder_call(hal_weaver_client, hal_weaver_server)
 
-add_hwservice(hal_weaver_server, hal_weaver_hwservice)
-hal_attribute_hwservice_client(hal_weaver, hal_weaver_hwservice)
+hal_attribute_hwservice(hal_weaver, hal_weaver_hwservice)

public/hal_wifi.te

@@ -2,8 +2,7 @@
 binder_call(hal_wifi_client, hal_wifi_server)
 binder_call(hal_wifi_server, hal_wifi_client)
 
-add_hwservice(hal_wifi_server, hal_wifi_hwservice)
-hal_attribute_hwservice_client(hal_wifi, hal_wifi_hwservice)
+hal_attribute_hwservice(hal_wifi, hal_wifi_hwservice)
 
 r_dir_file(hal_wifi, proc_net_type)
 r_dir_file(hal_wifi, sysfs_type)

public/hal_wifi_hostapd.te

@@ -2,8 +2,7 @@
 binder_call(hal_wifi_hostapd_client, hal_wifi_hostapd_server)
 binder_call(hal_wifi_hostapd_server, hal_wifi_hostapd_client)
 
-add_hwservice(hal_wifi_hostapd_server, hal_wifi_hostapd_hwservice)
-hal_attribute_hwservice_client(hal_wifi_hostapd, hal_wifi_hostapd_hwservice)
+hal_attribute_hwservice(hal_wifi_hostapd, hal_wifi_hostapd_hwservice)
 
 allow hal_wifi_hostapd_server self:global_capability_class_set { net_admin net_raw };
 

public/hal_wifi_offload.te

@@ -2,8 +2,7 @@
 binder_call(hal_wifi_offload_client, hal_wifi_offload_server)
 binder_call(hal_wifi_offload_server, hal_wifi_offload_client)
 
-add_hwservice(hal_wifi_offload_server, hal_wifi_offload_hwservice)
-hal_attribute_hwservice_client(hal_wifi_offload, hal_wifi_offload_hwservice)
+hal_attribute_hwservice(hal_wifi_offload, hal_wifi_offload_hwservice)
 
 r_dir_file(hal_wifi_offload, proc_net_type)
 r_dir_file(hal_wifi_offload, sysfs_type)

public/hal_wifi_supplicant.te

@@ -2,8 +2,7 @@
 binder_call(hal_wifi_supplicant_client, hal_wifi_supplicant_server)
 binder_call(hal_wifi_supplicant_server, hal_wifi_supplicant_client)
 
-add_hwservice(hal_wifi_supplicant_server, hal_wifi_supplicant_hwservice)
-hal_attribute_hwservice_client(hal_wifi_supplicant, hal_wifi_supplicant_hwservice)
+hal_attribute_hwservice(hal_wifi_supplicant, hal_wifi_supplicant_hwservice)
 
 # in addition to ioctls whitelisted for all domains, grant hal_wifi_supplicant priv_sock_ioctls.
 allowxperm hal_wifi_supplicant self:udp_socket ioctl priv_sock_ioctls;

public/te_macros

@@ -605,13 +605,15 @@ define(`add_hwservice', `
 ')
 
 ###########################################
-# hal_attribute_hwservice_client(attribute, service)
+# hal_attribute_hwservice(attribute, service)
 # Ability for domain to get a service to hwservice_manager
 # and find it. It also creates a neverallow preventing
 # others from adding it.
 #
 # Used to pair hal_foo_client with hal_foo_hwservice
-define(`hal_attribute_hwservice_client', `
+define(`hal_attribute_hwservice', `
   allow $1_client $2:hwservice_manager find;
   neverallow { domain -$1_client -$1_server } $2:hwservice_manager find;
+
+  add_hwservice($1_server, $2)
 ')