Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306
Merged-In: I29c17ebeea5fe190221a490ed4388a33ca7bd950
Change-Id: I69cc6656f3578612163c8743853fc33f270e239e
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>