From 7d1236ae7b686f379fa60e2a8134a760f5961000 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 4 May 2017 22:33:12 +0000
Subject: [PATCH] Revert "Set omx and configstore as optional."

Test: boots
Test: Youtube video works

Bug: 35356977
Fixes: 38001671

This reverts commit 49a6654ccf5675470b5f638a918a963cc446ee36.

Change-Id: I7b04aa62e248c7fae0307229d07ffa174109ff05
---
 compatibility_matrix.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/compatibility_matrix.xml b/compatibility_matrix.xml
index 8ef91b9d03..c643fc7ade 100644
--- a/compatibility_matrix.xml
+++ b/compatibility_matrix.xml
@@ -23,8 +23,7 @@
         <name>android.hardware.camera.provider</name>
         <version>2.4</version>
     </hal>
-    <!-- TODO(b/35356977): configstore is required. -->
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="false">
         <name>android.hardware.configstore</name>
         <version>1.0-1</version>
     </hal>
@@ -72,8 +71,7 @@
         <name>android.hardware.light</name>
         <version>2.0</version>
     </hal>
-    <!-- TODO(b/36097717): omx is required. -->
-    <hal format="hidl" optional="true">
+    <hal format="hidl" optional="false">
         <name>android.hardware.media.omx</name>
         <version>1.0</version>
     </hal>