commit a2f5b0bc518be3c2df38add7d4f089d803ebad9c
author Yifan Hong <elsk@google.com> Thu Sep 17 00:22:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 17 00:22:01 2020 +0000
tree 3bb9556611f809915bc6d540e3a1c87e1103f539
parent c9e5075d3651fed76c0cd3b23ae784c51b77864a
parent cd3d7cce0fc636bc16c0b3cd82d596629b0a5479

Merge changes I267b3ae9,Ic14d2257

* changes:
  Reorder/cleanup FCM exempt list #3 (fastboot)
  Reorder/cleanup FCM exempt list #2 (audio)

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 50653a1..4c400e9 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -44,9 +44,6 @@
 
     static std::vector<std::string> excluded_exact{
             // TODO(b/110261831): reduce items in this list
-            "android.hardware.audio@7.0",
-            "android.hardware.audio.effect@7.0",
-            "android.hardware.fastboot@1.0",
             "android.hardware.media.bufferpool@1.0",
             "android.hardware.media.bufferpool@2.0",
             "android.hardware.tv.cec@2.0",
@@ -61,6 +58,10 @@
             "android.hardware.common",
             "android.hardware.graphics.common",
             "android.hardware.keymaster",
+
+            // Fastboot HAL is only used by recovery. Recovery is owned by OEM. Framework
+            // does not depend on this HAL, hence it is not declared in any manifests or matrices.
+            "android.hardware.fastboot@1.0",
     };
 
     auto package_has_prefix = [&](const std::string& prefix) {