Merge "hal_health_default: updated sepolicy"

diff --git a/vendor/google/grilservice_app.te b/vendor/google/grilservice_app.te
index 68667c4..c757bc7 100644
--- a/vendor/google/grilservice_app.te
+++ b/vendor/google/grilservice_app.te

@@ -5,6 +5,7 @@
 allow grilservice_app hal_radioext_hwservice:hwservice_manager find;
 allow grilservice_app hal_wifi_ext_hwservice:hwservice_manager find;
 allow grilservice_app app_api_service:service_manager find;
+allow grilservice_app hal_bluetooth_sar_hwservice:hwservice_manager find;
 
 binder_call(grilservice_app, hal_radioext_default)
 binder_call(grilservice_app, hal_wifi_ext)

diff --git a/vendor/google/hwservice.te b/vendor/google/hwservice.te
index 1b3f60c..100e93a 100644
--- a/vendor/google/hwservice.te
+++ b/vendor/google/hwservice.te

@@ -1 +1,2 @@
 type hal_wifi_ext_hwservice, hwservice_manager_type, vendor_hwservice_type;
+type hal_bluetooth_sar_hwservice, hwservice_manager_type, vendor_hwservice_type;

diff --git a/vendor/google/hwservice_contexts b/vendor/google/hwservice_contexts
index cbdab7e..be65cef 100644
--- a/vendor/google/hwservice_contexts
+++ b/vendor/google/hwservice_contexts

@@ -1 +1,4 @@
 vendor.google.wifi_ext::IWifiExt                                u:object_r:hal_wifi_ext_hwservice:s0
+
+# Bluetooth HAL extension
+hardware.google.bluetooth.sar::IBluetoothSar                    u:object_r:hal_bluetooth_sar_hwservice:s0

diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts
index 5f7cdbf..d2fd37e 100644
--- a/vendor/qcom/common/seapp_contexts
+++ b/vendor/qcom/common/seapp_contexts

@@ -15,7 +15,7 @@
 user=_app seinfo=tango name=com.google.tango:app domain=untrusted_app type=app_data_file levelFrom=user
 
 # Hardware Info Collection
-user=_app seinfo=platform name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
+user=_app isPrivApp=true name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user
 
 # Use a custom domain for GoogleCamera, to allow for Hexagon DSP access
 user=_app seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=user