Merge "Wifi Keystore HAL is not a HAL" into oc-dev

This commit is contained in:
Alex Klyubin 2017-04-06 04:02:03 +00:00 committed by Android (Google) Code Review
commit 7c3dbfeb69
4 changed files with 16 additions and 6 deletions

View File

@ -242,3 +242,12 @@ attribute hal_wifi_keystore_server;
attribute hal_wifi_supplicant;
attribute hal_wifi_supplicant_client;
attribute hal_wifi_supplicant_server;
# HwBinder services offered across the core-vendor boundary
#
# We annotate server domains with x_server to loosen the coupling between
# system and vendor images. For example, it should be possible to move a service
# from one core domain to another, without having to update the vendor image
# which contains clients of this service.
attribute wifi_keystore_service_server;

View File

@ -1,2 +0,0 @@
# HwBinder IPC from client to server.
binder_call(hal_wifi_keystore_client, hal_wifi_keystore_server)

View File

@ -10,8 +10,9 @@ binder_call(keystore, system_server)
# talk to keymaster
hal_client_domain(keystore, hal_keymaster)
# Implement the wifi keystore hal.
hal_server_domain(keystore, hal_wifi_keystore)
# Offer the Wifi Keystore HwBinder service
hwbinder_use(keystore)
typeattribute keystore wifi_keystore_service_server;
allow keystore keystore_data_file:dir create_dir_perms;
allow keystore keystore_data_file:notdevfile_class_set create_file_perms;

View File

@ -8,8 +8,10 @@ net_domain(hal_wifi_supplicant_default)
# Create a socket for receiving info from wpa
type_transition hal_wifi_supplicant_default wifi_data_file:dir wpa_socket "sockets";
# Allow wpa_supplicant to talk to Wifi Keystore HAL.
hal_client_domain(hal_wifi_supplicant_default, hal_wifi_keystore)
# Allow wpa_supplicant to talk to Wifi Keystore HwBinder service.
hwbinder_use(hal_wifi_supplicant_default)
binder_call(hal_wifi_supplicant_default, wifi_keystore_service_server)
# TODO (b/36645291) Move hal_wifi_supplicant's data access to /data/vendor
# Remove coredata_in_vendor_violators attribute.
# wpa supplicant or equivalent