From d20ebb4f6f5ec2119371735f0487991ac54d4403 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 28 Apr 2022 19:54:31 +0000 Subject: [PATCH] Fixes sensors AIDL default impl APEX's binary name. commit bde01c60fadb8da6a1a24bca3dd21e17229c4316 moved this APEX from the HIDL to AIDL impl, but accidentally left out the rename of the binary in the file_contexts Also deletes unused .rc file here; the APEX already reuses the .rc file from outside the APEX dir. Bug: 222579208 Test: Build cf_x86_64_phone using sensors APEX: http://ab/P33964358 Boot the device, use accel sensor to rotate the screen. Change-Id: Ib107770312bb80b67364c855efd2df3a9bc52b9a (cherry picked from commit 80e55dabf3a0a052c929a27d5ab2bc628b96c62b) --- sensors/aidl/default/apex/com.android.hardware.sensors.rc | 7 ------- sensors/aidl/default/apex/file_contexts | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 sensors/aidl/default/apex/com.android.hardware.sensors.rc diff --git a/sensors/aidl/default/apex/com.android.hardware.sensors.rc b/sensors/aidl/default/apex/com.android.hardware.sensors.rc deleted file mode 100644 index bd245b4ebd..0000000000 --- a/sensors/aidl/default/apex/com.android.hardware.sensors.rc +++ /dev/null @@ -1,7 +0,0 @@ -service vendor.sensors-hal-2-1-mock /apex/com.android.hardware.sensors/bin/hw/android.hardware.sensors@2.1-service.mock - interface android.hardware.sensors@2.0::ISensors default - interface android.hardware.sensors@2.1::ISensors default - class hal - user system - group system - rlimit rtprio 10 10 diff --git a/sensors/aidl/default/apex/file_contexts b/sensors/aidl/default/apex/file_contexts index d0095c03be..27be16b14e 100644 --- a/sensors/aidl/default/apex/file_contexts +++ b/sensors/aidl/default/apex/file_contexts @@ -2,4 +2,4 @@ # Permission XMLs /etc/permissions(/.*)? u:object_r:vendor_configs_file:s0 # Service binary -/bin/hw/android\.hardware\.sensors@2\.1-service\.mock u:object_r:hal_sensors_default_exec:s0 +/bin/hw/android\.hardware\.sensors-service\.example u:object_r:hal_sensors_default_exec:s0 \ No newline at end of file