Remove 'optional' from all frozen DCMs
This desired behavior is now handled by libvintffm directly.
Test: remove sensorservice from framework manifest && verify error
Test: remove cameraservice from framework manifest && verify no error
Test: atest -p
Bug: 247575800
Change-Id: I8b10a2f851f90b264c5b111a77d93595caca9c97
diff --git a/vintfdata/device_compatibility_matrix.default.xml b/vintfdata/device_compatibility_matrix.default.xml
index 70d23e2..1a050fc 100644
--- a/vintfdata/device_compatibility_matrix.default.xml
+++ b/vintfdata/device_compatibility_matrix.default.xml
@@ -1,5 +1,5 @@
<compatibility-matrix version="1.0" type="device">
- <hal format="hidl" optional="true">
+ <hal format="hidl">
<name>android.hidl.manager</name>
<version>1.0</version>
<interface>
diff --git a/vintfdata/frozen/202404.xml b/vintfdata/frozen/202404.xml
index 91d537a..06a6918 100644
--- a/vintfdata/frozen/202404.xml
+++ b/vintfdata/frozen/202404.xml
@@ -3,7 +3,7 @@
cameraserver is installed for all phones and tablets, but not
auto, TV, or Wear.
-->
- <hal format="aidl" optional="true">
+ <hal format="aidl">
<name>android.frameworks.cameraservice.service</name>
<version>2</version>
<interface>
@@ -11,7 +11,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.location.altitude</name>
<version>2</version>
<interface>
@@ -19,14 +19,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.sensorservice</name>
<interface>
<name>ISensorManager</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.stats</name>
<version>2</version>
<interface>
@@ -37,21 +37,21 @@
<!--
vibrator is installed for all form factors except TV
-->
- <hal format="aidl" optional="true">
+ <hal format="aidl">
<name>android.frameworks.vibrator</name>
<interface>
<name>IVibratorControlService</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.hardware.media.c2</name>
<interface>
<name>IComponentStore</name>
<instance>software</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.keystore2</name>
<version>4</version>
<interface>
@@ -59,14 +59,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.net.netd</name>
<interface>
<name>INetd</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.suspend</name>
<interface>
<name>ISystemSuspend</name>
diff --git a/vintfdata/frozen/5.xml b/vintfdata/frozen/5.xml
index 525829d..cb99f43 100644
--- a/vintfdata/frozen/5.xml
+++ b/vintfdata/frozen/5.xml
@@ -3,7 +3,7 @@
cameraserver is installed for all phones and tablets, but not
auto or TV.
-->
- <hal format="hidl" optional="true">
+ <hal format="hidl">
<name>android.frameworks.cameraservice.service</name>
<version>2.1</version>
<interface>
@@ -11,7 +11,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.displayservice</name>
<version>1.0</version>
<interface>
@@ -19,7 +19,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.schedulerservice</name>
<version>1.0</version>
<interface>
@@ -27,7 +27,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
<interface>
@@ -35,7 +35,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.stats</name>
<version>1.0</version>
<interface>
@@ -43,7 +43,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hardware.media.c2</name>
<version>1.1</version>
<interface>
@@ -51,7 +51,7 @@
<instance>software</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.allocator</name>
<version>1.0</version>
<interface>
@@ -59,7 +59,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.manager</name>
<version>1.2</version>
<interface>
@@ -67,7 +67,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.memory</name>
<version>1.0</version>
<interface>
@@ -75,7 +75,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.token</name>
<version>1.0</version>
<interface>
@@ -83,7 +83,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.net.netd</name>
<version>1.1</version>
<interface>
@@ -91,7 +91,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.suspend</name>
<version>1.0</version>
<interface>
@@ -99,7 +99,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.wifi.keystore</name>
<version>1.0</version>
<interface>
diff --git a/vintfdata/frozen/6.xml b/vintfdata/frozen/6.xml
index eb078c0..d0b93c7 100644
--- a/vintfdata/frozen/6.xml
+++ b/vintfdata/frozen/6.xml
@@ -3,7 +3,7 @@
cameraserver is installed for all phones and tablets, but not
auto or TV.
-->
- <hal format="hidl" optional="true">
+ <hal format="hidl">
<name>android.frameworks.cameraservice.service</name>
<version>2.2</version>
<interface>
@@ -11,7 +11,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.displayservice</name>
<version>1.0</version>
<interface>
@@ -19,7 +19,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
<interface>
@@ -27,14 +27,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.stats</name>
<interface>
<name>IStats</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hardware.media.c2</name>
<version>1.2</version>
<interface>
@@ -42,7 +42,7 @@
<instance>software</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.allocator</name>
<version>1.0</version>
<interface>
@@ -50,7 +50,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.manager</name>
<version>1.2</version>
<interface>
@@ -58,7 +58,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.memory</name>
<version>1.0</version>
<interface>
@@ -66,7 +66,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.token</name>
<version>1.0</version>
<interface>
@@ -74,7 +74,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.keystore2</name>
<version>2</version>
<interface>
@@ -82,7 +82,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.net.netd</name>
<version>1.1</version>
<interface>
@@ -90,7 +90,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.suspend</name>
<version>1.0</version>
<interface>
@@ -98,14 +98,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.suspend</name>
<interface>
<name>ISystemSuspend</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.wifi.keystore</name>
<version>1.0</version>
<interface>
diff --git a/vintfdata/frozen/7.xml b/vintfdata/frozen/7.xml
index fcfeba7..83cc860 100644
--- a/vintfdata/frozen/7.xml
+++ b/vintfdata/frozen/7.xml
@@ -3,7 +3,7 @@
cameraserver is installed for all phones and tablets, but not
auto or TV.
-->
- <hal format="hidl" optional="true">
+ <hal format="hidl">
<name>android.frameworks.cameraservice.service</name>
<version>2.2</version>
<interface>
@@ -11,7 +11,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
<interface>
@@ -19,14 +19,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.stats</name>
<interface>
<name>IStats</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hardware.media.c2</name>
<version>1.2</version>
<interface>
@@ -34,7 +34,7 @@
<instance>software</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.allocator</name>
<version>1.0</version>
<interface>
@@ -42,7 +42,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.manager</name>
<version>1.2</version>
<interface>
@@ -50,7 +50,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.memory</name>
<version>1.0</version>
<interface>
@@ -58,7 +58,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.token</name>
<version>1.0</version>
<interface>
@@ -66,7 +66,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.keystore2</name>
<version>2</version>
<interface>
@@ -74,7 +74,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.net.netd</name>
<version>1.1</version>
<interface>
@@ -82,14 +82,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.suspend</name>
<interface>
<name>ISystemSuspend</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.system.wifi.keystore</name>
<version>1.0</version>
<interface>
diff --git a/vintfdata/frozen/8.xml b/vintfdata/frozen/8.xml
index 58db476..e50f0dc 100644
--- a/vintfdata/frozen/8.xml
+++ b/vintfdata/frozen/8.xml
@@ -3,28 +3,28 @@
cameraserver is installed for all phones and tablets, but not
auto, TV, or Wear.
-->
- <hal format="aidl" optional="true">
+ <hal format="aidl">
<name>android.frameworks.cameraservice.service</name>
<interface>
<name>ICameraService</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.location.altitude</name>
<interface>
<name>IAltitudeService</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.sensorservice</name>
<interface>
<name>ISensorManager</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.frameworks.sensorservice</name>
<version>1.0</version>
<interface>
@@ -32,7 +32,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.frameworks.stats</name>
<version>2</version>
<interface>
@@ -40,7 +40,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hardware.media.c2</name>
<version>1.2</version>
<interface>
@@ -48,7 +48,7 @@
<instance>software</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.allocator</name>
<version>1.0</version>
<interface>
@@ -56,7 +56,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.manager</name>
<version>1.2</version>
<interface>
@@ -64,7 +64,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.memory</name>
<version>1.0</version>
<interface>
@@ -72,7 +72,7 @@
<instance>ashmem</instance>
</interface>
</hal>
- <hal format="hidl" optional="false">
+ <hal format="hidl">
<name>android.hidl.token</name>
<version>1.0</version>
<interface>
@@ -80,7 +80,7 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.keystore2</name>
<version>3</version>
<interface>
@@ -88,14 +88,14 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.net.netd</name>
<interface>
<name>INetd</name>
<instance>default</instance>
</interface>
</hal>
- <hal format="aidl" optional="false">
+ <hal format="aidl">
<name>android.system.suspend</name>
<interface>
<name>ISystemSuspend</name>