From dc83563449ffe17c4f0194776c616c0a31310dbe Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 16 Mar 2018 14:23:10 -0700
Subject: [PATCH] matrix: Set drm 1.1/* as required, 1.0/* as optional

This correctly specifies the requirement of framework
on device. Specifically:

A device at target FCM version 2 is still required to
provide 1.0/default as specified in 2.xml.

Combined matrix at FCM version 2 has the following:
optional: 1.1/.*
optional: 1.0/.*
required: 1.0/default

A device at target FCM version 3 is required to provide
1.0-1/(any instance) as specified in 3.xml.

Matrix at FCM version 3 has the following:
required: 1.1/.*
optional: 1.0/.*

OTA: old libvintf does not recognize the <regex-instance>
tag, and parse this as "no instance requirements"
(satisfyAllInstances returns true). Hence this should
state no restrictions for old libvintf.

Caveat:
if a device does not provide any DRM instance, OTA
(specifically, full OTA that upgrades vendor image to
target level 3) will pass, but when the device is booted
there will be run-time checks about inconsistent builds
and VTS failures. But this case should be caught at build
time.

Test: vts_treble_vintf_test
Test: vts_testability_checker64 --compliance \
      android.hardware.drm@1.0::IDrmFactory
Test: vts_testability_checker64 --compliance \
      android.hardware.drm@1.1::IDrmFactory
Fixes: 73556059
Bug: 68112778
Change-Id: I45c76356d304a94d716eddebc621d367c0ce165a
---
 .../compatibility_matrix.current.xml           | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/compatibility_matrices/compatibility_matrix.current.xml b/compatibility_matrices/compatibility_matrix.current.xml
index 95fe959663..486c548efc 100644
--- a/compatibility_matrices/compatibility_matrix.current.xml
+++ b/compatibility_matrices/compatibility_matrix.current.xml
@@ -103,16 +103,28 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="false">
+    <hal format="hidl" optional="true">
         <name>android.hardware.drm</name>
         <version>1.0</version>
         <interface>
             <name>ICryptoFactory</name>
-            <instance>default</instance>
+            <regex-instance>.*</regex-instance>
         </interface>
         <interface>
             <name>IDrmFactory</name>
-            <instance>default</instance>
+            <regex-instance>.*</regex-instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="false">
+        <name>android.hardware.drm</name>
+        <version>1.1</version>
+        <interface>
+            <name>ICryptoFactory</name>
+            <regex-instance>.*</regex-instance>
+        </interface>
+        <interface>
+            <name>IDrmFactory</name>
+            <regex-instance>.*</regex-instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">