[automerger skipped] Merge "Merge Android 14 QPR3 to AOSP main" into main am: 7fd4a92913 -s ours am: 31d0ffd08a -s ours
am skip reason: Merged-In I3781ebcfa0b297aa89420245540d269ebecd613d with SHA-1 f74b62e80a is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/3131256
Change-Id: I9320cb8e7c2be0695637af50e17a0633897d51e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/modules/sensors/dynamic_sensor/Android.bp b/modules/sensors/dynamic_sensor/Android.bp
index 1ede955..8bf2885 100644
--- a/modules/sensors/dynamic_sensor/Android.bp
+++ b/modules/sensors/dynamic_sensor/Android.bp
@@ -38,6 +38,7 @@
"libbase",
"libhidparser",
"server_configurable_flags",
+ "libaconfig_storage_read_api_cc",
],
static_libs: [
diff --git a/modules/sensors/dynamic_sensor/README.md b/modules/sensors/dynamic_sensor/README.md
index 8af15a9..45d60ec 100644
--- a/modules/sensors/dynamic_sensor/README.md
+++ b/modules/sensors/dynamic_sensor/README.md
@@ -15,6 +15,9 @@
in the Linux kernel (`CONFIG_HIDRAW=y`), and SELinux policy files must be updated
to provide the necessary permissions. Example changes are provided below.
+Note: as of Android 15, the `hidraw_device` SELinux label is provided by the
+system.
+
```shell
acme-co$ git -C device/acme/rocket-phone diff
diff --git a/sensor_hal/hals.conf b/sensor_hal/hals.conf
@@ -68,18 +71,6 @@
#
# Thruster sensor enforcements.
#
-diff --git a/sepolicy/device.te b/sepolicy/device.te
-index bc3c947..bad0be0 100644
---- a/sepolicy/device.te
-+++ b/sepolicy/device.te
-@@ -55,3 +55,7 @@
-
- # Thruster
- type thruster_device, dev_type;
-+
-+# Raw HID device
-+type hidraw_device, dev_type;
-+
diff --git a/sepolicy/property.te b/sepolicy/property.te
index 4b671a4..bb0894f 100644
--- a/sepolicy/property.te