commit 2a327c84090d53d0ef67b0942079f0b29937e5b9
author Yifan Hong <elsk@google.com> Fri Sep 18 00:39:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 18 00:39:13 2020 +0000
tree c94b2f81fcfc2b5598bb762a3697ee0c4a51aa2e
parent 7ba81ef68d5afa58175f3218bff31d1fd92f7aca
parent 54b5003b09a08d27069c60e898c336def6c17acf

Merge "Reorder/cleanup FCM exempt list #4 (media bufferpool)" am: e2ed8135cd am: 6bbaf817cc am: a1fade51b7 am: 54b5003b09

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

Change-Id: I5cfa78a0f76d7f89bddb4a25e5ce1eb970d11394

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 4c400e9..2f092e1 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -44,8 +44,6 @@
 
     static std::vector<std::string> excluded_exact{
             // TODO(b/110261831): reduce items in this list
-            "android.hardware.media.bufferpool@1.0",
-            "android.hardware.media.bufferpool@2.0",
             "android.hardware.tv.cec@2.0",
             "android.hardware.tv.tuner@1.0",
 
@@ -53,6 +51,8 @@
             // HIDL
             "android.hardware.cas.native@1.0",
             "android.hardware.gnss.visibility_control@1.0",
+            "android.hardware.media.bufferpool@1.0",
+            "android.hardware.media.bufferpool@2.0",
             "android.hardware.radio.config@1.2",
             // AIDL
             "android.hardware.common",