resolve merge conflicts of c998f319 to stage-aosp-master

Test: after cherry-pick - it builds
Merged-In: I57c0150a52c13f1ce21f9ae2147e3814aad0fb7e
Change-Id: I7da8160a95e09946d283bd849628bd5392410353
This commit is contained in:
Tomasz Wasilczyk 2017-09-15 14:02:55 -07:00
commit 6ba6705c51
7 changed files with 19 additions and 1 deletions

View file

@ -6,7 +6,7 @@ android.hardware.audio::IDevicesFactory u:object_r:hal_a
android.hardware.biometrics.fingerprint::IBiometricsFingerprint u:object_r:hal_fingerprint_hwservice:s0
android.hardware.bluetooth::IBluetoothHci u:object_r:hal_bluetooth_hwservice:s0
android.hardware.boot::IBootControl u:object_r:hal_bootctl_hwservice:s0
android.hardware.broadcastradio::IBroadcastRadioFactory u:object_r:hal_audio_hwservice:s0
android.hardware.broadcastradio::IBroadcastRadioFactory u:object_r:hal_broadcastradio_hwservice:s0
android.hardware.camera.provider::ICameraProvider u:object_r:hal_camera_hwservice:s0
android.hardware.configstore::ISurfaceFlingerConfigs u:object_r:hal_configstore_ISurfaceFlingerConfigs:s0
android.hardware.contexthub::IContexthub u:object_r:hal_contexthub_hwservice:s0

View file

@ -183,6 +183,7 @@ binder_service(system_server)
# Use HALs
hal_client_domain(system_server, hal_allocator)
hal_client_domain(system_server, hal_broadcastradio)
hal_client_domain(system_server, hal_configstore)
hal_client_domain(system_server, hal_contexthub)
hal_client_domain(system_server, hal_fingerprint)

View file

@ -202,6 +202,12 @@ attribute hal_bootctl_client;
expandattribute hal_bootctl_client true;
attribute hal_bootctl_server;
expandattribute hal_bootctl_server false;
attribute hal_broadcastradio;
expandattribute hal_broadcastradio true;
attribute hal_broadcastradio_client;
expandattribute hal_broadcastradio_client true;
attribute hal_broadcastradio_server;
expandattribute hal_broadcastradio_server false;
attribute hal_camera;
expandattribute hal_camera false;
attribute hal_camera_client;

View file

@ -0,0 +1,4 @@
binder_call(hal_broadcastradio_client, hal_broadcastradio_server)
add_hwservice(hal_broadcastradio_server, hal_broadcastradio_hwservice)
allow hal_broadcastradio_client hal_broadcastradio_hwservice:hwservice_manager find;

View file

@ -5,6 +5,7 @@ type fwk_sensor_hwservice, hwservice_manager_type, coredomain_hwservice;
type hal_audio_hwservice, hwservice_manager_type;
type hal_bluetooth_hwservice, hwservice_manager_type;
type hal_bootctl_hwservice, hwservice_manager_type;
type hal_broadcastradio_hwservice, hwservice_manager_type;
type hal_camera_hwservice, hwservice_manager_type;
type hal_configstore_ISurfaceFlingerConfigs, hwservice_manager_type;
type hal_contexthub_hwservice, hwservice_manager_type;

View file

@ -5,6 +5,7 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.bluetooth@1\.0-service u:object_r:hal_bluetooth_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.biometrics\.fingerprint@2\.1-service u:object_r:hal_fingerprint_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.boot@1\.0-service u:object_r:hal_bootctl_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.broadcastradio@1\.1-service u:object_r:hal_broadcastradio_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.camera\.provider@2\.4-service u:object_r:hal_camera_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.configstore@1\.[0-9]+-service u:object_r:hal_configstore_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.contexthub@1\.0-service u:object_r:hal_contexthub_default_exec:s0

5
vendor/hal_broadcastradio_default.te vendored Normal file
View file

@ -0,0 +1,5 @@
type hal_broadcastradio_default, domain;
hal_server_domain(hal_broadcastradio_default, hal_broadcastradio)
type hal_broadcastradio_default_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hal_broadcastradio_default)