Merge "switch cuttlefish to stable AIDL vibrator"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 2899871..a3eb81c 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -51,3 +51,6 @@
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.health@2.0-service.cuttlefish)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.health@2.0-service.cuttlefish.rc)
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index 9a66e49..a9eb8fc 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -172,15 +172,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>android.hardware.health</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>IHealth</name>
- <instance>default</instance>
- </interface>
- </hal>
<!-- TODO (b/130075874):
<hal format="hidl">
<name>android.hardware.ir</name>
diff --git a/shared/device.mk b/shared/device.mk
index 1171067..8462b96 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -267,7 +267,8 @@
# Health
PRODUCT_PACKAGES += \
- android.hardware.health@2.0-service.cuttlefish
+ android.hardware.health@2.1-impl-cuttlefish \
+ android.hardware.health@2.1-service
# Health Storage
PRODUCT_PACKAGES += \
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 77c39cb..70b47ad 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -64,7 +64,6 @@
/vendor/bin/hw/android\.hardware\.drm@1\.2-service-lazy\.widevine u:object_r:hal_drm_widevine_exec:s0
/vendor/bin/hw/android\.hardware\.dumpstate@1\.0-service\.cuttlefish u:object_r:hal_dumpstate_impl_exec:s0
/vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0
-/vendor/bin/hw/android\.hardware\.health@2\.0-service\.cuttlefish u:object_r:hal_health_default_exec:s0
/vendor/bin/hw/android\.hardware\.health\.storage@1\.0-service\.cuttlefish u:object_r:hal_health_storage_default_exec:s0
/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-sample-.* u:object_r:hal_neuralnetworks_sample_exec:s0
/vendor/bin/hw/android\.hardware\.vibrator@1\.x-service\.example u:object_r:hal_vibrator_default_exec:s0
@@ -82,6 +81,7 @@
/vendor/lib(64)?/libglapi.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@2\.0-impl-2\.1\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/android\.hardware\.health@2\.1-impl-cuttlefish u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc.cutf_ashmem.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/hw/gralloc.minigbm.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libcuttlefish_fs.so u:object_r:same_process_hal_file:s0
diff --git a/shared/sepolicy/vendor/priv_app.te b/shared/sepolicy/vendor/priv_app.te
index 05c9e47..48af07f 100644
--- a/shared/sepolicy/vendor/priv_app.te
+++ b/shared/sepolicy/vendor/priv_app.te
@@ -1 +1,2 @@
gpu_access(priv_app)
+get_prop(priv_app, hal_camera_prop)
diff --git a/shared/sepolicy/vendor/property_contexts b/shared/sepolicy/vendor/property_contexts
index 5127c67..08c1150 100644
--- a/shared/sepolicy/vendor/property_contexts
+++ b/shared/sepolicy/vendor/property_contexts
@@ -1,6 +1,7 @@
bt.rootcanal_test_console u:object_r:hal_bluetooth_sim_prop:s0
qemu.sf.back_camera_caps u:object_r:hal_camera_prop:s0
qemu.sf.front_camera_caps u:object_r:hal_camera_prop:s0
+qemu.sf.fake_camera u:object_r:hal_camera_prop:s0
ro.boot.cuttlefish_config_server_port u:object_r:cuttlefish_config_server_port_prop:s0
ro.boot.fstab_name u:object_r:cf_fstab_name_prop:s0 exact string
ro.boot.hardware.egl u:object_r:cf_graphics_config_prop:s0 exact string
