commit e680e3e09a24a1d210e766a84e4cd8d29dd496c1
author Yifan Hong <elsk@google.com> Thu Sep 17 08:51:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 17 08:51:07 2020 +0000
tree 979ab3f84ecc7d1620dc67602e90562510f42c2b
parent 327f5b47eb7a32831616c95f41d6200b2afd6071
parent 5e71ed7b5a4594c9b56cf5d51721972b86070913

Merge changes I267b3ae9,Ic14d2257 am: a2f5b0bc51 am: d0fd20654c am: 7a3eedb0dd am: a40a55aa3e am: 5e71ed7b5a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1427726

Change-Id: I8dda6f775e995b9f79a1f49cb2747004bf9dc29b

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index ce25a19..074192c 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",
@@ -62,6 +59,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) {