commit a0ceda90162c87f9cdc653708bf436abb5870ee4
author Tri Vo <trong@google.com> Tue Oct 27 00:22:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 27 00:22:24 2020 +0000
tree 2b6e1b92a07f90b6ff4231945fbf9dbc837632b9
parent 7fb9b1f1e214c727f6df00951c55fc987fe1c337
parent efbbb2d2f92ba3e6fff1be031533f12d68e46088

Merge "Revert "mark more hals as optional in frozen matrix."" am: b1718de4ad am: 1706a4dd3f am: 44179bdca6 am: efbbb2d2f9

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

Change-Id: Ia743e58022dde6f68f6105b82ae7d6303a618ae2

vintfdata/frozen/5.xml

diff --git a/vintfdata/frozen/5.xml b/vintfdata/frozen/5.xml
index 71060ec..525829d 100644
--- a/vintfdata/frozen/5.xml
+++ b/vintfdata/frozen/5.xml
@@ -35,8 +35,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- TODO(b/171424919) set to required once trusty installs it. -->
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="false">
         <name>android.frameworks.stats</name>
         <version>1.0</version>
         <interface>
@@ -44,8 +43,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- TODO(b/171424919) set to required once trusty installs it. -->
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="false">
         <name>android.hardware.media.c2</name>
         <version>1.1</version>
         <interface>
@@ -93,8 +91,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <!-- TODO(b/171424919) set to required once trusty installs it. -->
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="false">
         <name>android.system.suspend</name>
         <version>1.0</version>
         <interface>