commit cbbe0f42ee90e44ab0e04b184b9e8edbc66babbb
author Xin Li <delphij@google.com> Sat Sep 07 03:54:18 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Sep 07 03:54:18 2024 +0000
tree 1c6fa63cb5d381f8c5db8e72e46f06ee88440553
parent f8ec34cd67538ff8f92e2a9590310df9c8052a24
parent 1200453f19ac9494f0d98f0890742a08c95adeb7

[automerger skipped] Merge 24Q3 to AOSP main am: b7c8b0376d -s ours am: 1200453f19 -s ours

am skip reason: Merged-In I2141d527a5a6d0a3b4f31911b5a468c885b8a782 with SHA-1 2dcc01ed1b is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/3258382

Change-Id: Ie4ac15cb623fce243d8012da80811e3e019aaf6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vintfdata/frozen/202404.xml

diff --git a/vintfdata/frozen/202404.xml b/vintfdata/frozen/202404.xml
index fa5e3ac..91d537a 100644
--- a/vintfdata/frozen/202404.xml
+++ b/vintfdata/frozen/202404.xml
@@ -1,5 +1,9 @@
 <compatibility-matrix version="8.0" type="device">
-    <hal format="aidl" optional="false">
+    <!--
+         cameraserver is installed for all phones and tablets, but not
+         auto, TV, or Wear.
+    -->
+    <hal format="aidl" optional="true">
         <name>android.frameworks.cameraservice.service</name>
         <version>2</version>
         <interface>
@@ -30,7 +34,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="false">
+    <!--
+          vibrator is installed for all form factors except TV
+    -->
+    <hal format="aidl" optional="true">
         <name>android.frameworks.vibrator</name>
         <interface>
             <name>IVibratorControlService</name>