Revert "bringup occupant_awareness and evs services" This reverts commit 1243b2d460b317a6d57b1dbd94bf9b93ce26ab4c. Reason for revert: this build breaks <>-user targets b/148241305 Change-Id: Ib0046c45effef5894337b2fe85cfea23aa9933e2
diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk index 4bf580a..a51c5d3 100644 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ b/crosshatch_car/aosp_crosshatch_car.mk
@@ -48,15 +48,13 @@ PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service \ - android.hardware.automotive.evs@1.1-service -PRODUCT_PACKAGES += android.hardware.automotive.occupant_awareness@1.0-service -PRODUCT_PACKAGES += android.hardware.automotive.occupant_awareness@1.0-service_mock + android.hardware.automotive.evs@1.0-service # Car init.rc PRODUCT_COPY_FILES += \ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc \ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \ - $(LOCAL_PATH)/vendor/automotive.evs@1.1-service.rc:/vendor/etc/init/android.hardware.automotive.evs@1.1-service.rc + $(LOCAL_PATH)/vendor/automotive.evs@1.0-service.rc:/vendor/etc/init/android.hardware.automotive.evs@1.0-service.rc # Override heap growth limit due to high display density on device PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/crosshatch_car/manifest.xml b/crosshatch_car/manifest.xml index 1b53222..46b8b9c 100644 --- a/crosshatch_car/manifest.xml +++ b/crosshatch_car/manifest.xml
@@ -20,19 +20,12 @@ <hal format="hidl"> <name>android.hardware.automotive.evs</name> <transport>hwbinder</transport> - <version>1.1</version> + <version>1.0</version> <interface> <name>IEvsEnumerator</name> <instance>EvsEnumeratorHw</instance> </interface> </hal> - <hal format="aidl"> - <name>android.hardware.automotive.occupant_awareness</name> - <interface> - <name>IOccupantAwareness</name> - <instance>default</instance> - </interface> - </hal> <!-- FIXME: Move this to shared manifest.xml --> <hal format="hidl"> <name>android.hardware.broadcastradio</name>
diff --git a/crosshatch_car/sepolicy/Android.mk b/crosshatch_car/sepolicy/Android.mk deleted file mode 100644 index 24de3ae..0000000 --- a/crosshatch_car/sepolicy/Android.mk +++ /dev/null
@@ -1,7 +0,0 @@ -#include packages/services/Car/car_product/occupant_awareness/OccupantAwareness.mk - -SELINUX_IGNORE_NEVERALLOWS := true - -BOARD_PLAT_PUBLIC_SEPOLICY_DIR += device/google_car/crosshatch_car/sepolicy/generic/public -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/google_car/crosshatch_car/sepolicy/generic/private -BOARD_SEPOLICY_DIRS += device/google_car/crosshatch_car/sepolicy/generic
diff --git a/crosshatch_car/sepolicy/generic/file_contexts b/crosshatch_car/sepolicy/generic/file_contexts deleted file mode 100644 index 09a2859..0000000 --- a/crosshatch_car/sepolicy/generic/file_contexts +++ /dev/null
@@ -1 +0,0 @@ -/vendor/bin/hw/android\.hardware\.automotive\.occupant_awareness@1\.0-service u:object_r:hal_occupant_awareness_default_exec:s0
diff --git a/crosshatch_car/sepolicy/generic/hal_evs_defaul.te b/crosshatch_car/sepolicy/generic/hal_evs_defaul.te deleted file mode 100644 index eee0a21..0000000 --- a/crosshatch_car/sepolicy/generic/hal_evs_defaul.te +++ /dev/null
@@ -1 +0,0 @@ -allow hal_evs_default system_file:file {read open getattr};
diff --git a/crosshatch_car/sepolicy/generic/hal_occupant_awareness_default.te b/crosshatch_car/sepolicy/generic/hal_occupant_awareness_default.te deleted file mode 100644 index be8ca9e..0000000 --- a/crosshatch_car/sepolicy/generic/hal_occupant_awareness_default.te +++ /dev/null
@@ -1,7 +0,0 @@ -type hal_occupant_awareness_default, domain; -hal_server_domain(hal_occupant_awareness_default, hal_occupant_awareness) - -type hal_occupant_awareness_default_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_occupant_awareness_default) - -allow hal_occupant_awareness_default default_android_service:service_manager add;
diff --git a/crosshatch_car/sepolicy/generic/private/service_contexts b/crosshatch_car/sepolicy/generic/private/service_contexts deleted file mode 100644 index 3796d53..0000000 --- a/crosshatch_car/sepolicy/generic/private/service_contexts +++ /dev/null
@@ -1 +0,0 @@ -android.hardware.automotive.occupant_awareness.IOccupantAwareness/default u:object_r:hal_occupant_awareness_service:s0
diff --git a/crosshatch_car/sepolicy/generic/public/attributes b/crosshatch_car/sepolicy/generic/public/attributes deleted file mode 100644 index d772d1c..0000000 --- a/crosshatch_car/sepolicy/generic/public/attributes +++ /dev/null
@@ -1 +0,0 @@ -hal_attribute(occupant_awareness);
diff --git a/crosshatch_car/sepolicy/generic/public/hal_occupant_awareness.te b/crosshatch_car/sepolicy/generic/public/hal_occupant_awareness.te deleted file mode 100644 index bcc522f..0000000 --- a/crosshatch_car/sepolicy/generic/public/hal_occupant_awareness.te +++ /dev/null
@@ -1,8 +0,0 @@ -# HwBinder IPC from client to server, and callbacks -binder_call(hal_occupant_awareness_client, hal_occupant_awareness_server) -binder_call(hal_occupant_awareness_server, hal_occupant_awareness_client) -add_service(hal_occupant_awareness_server, hal_occupant_awareness_service) - -binder_use(hal_occupant_awareness_server) - -allow hal_occupant_awareness_client hal_occupant_awareness_service:service_manager find;
diff --git a/crosshatch_car/sepolicy/generic/public/service.te b/crosshatch_car/sepolicy/generic/public/service.te deleted file mode 100644 index a2ff448..0000000 --- a/crosshatch_car/sepolicy/generic/public/service.te +++ /dev/null
@@ -1 +0,0 @@ -type hal_occupant_awareness_service, vendor_service, service_manager_type;
diff --git a/crosshatch_car/vendor/automotive.evs@1.1-service.rc b/crosshatch_car/vendor/automotive.evs@1.1-service.rc deleted file mode 100644 index 749375a..0000000 --- a/crosshatch_car/vendor/automotive.evs@1.1-service.rc +++ /dev/null
@@ -1,4 +0,0 @@ -service vendor.evs-hal-mock /vendor/bin/hw/android.hardware.automotive.evs@1.1-service - class hal - user automotive_evs - group automotive_evs