commit 4fd960f90a6fe66f15a5bc654d2d836c4a5980cc
author Yifan Hong <elsk@google.com> Wed Sep 16 19:42:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 16 19:42:41 2020 +0000
tree f0dee22525cc19fb7458bd23be9d5c03ee577e81
parent 93bc41f96ff40b47b795ee394de893f9f1799abb
parent 8f7f56ff3c50cc804c644fa8aae8be437cbc5c7f

Merge "Reorder/cleanup FCM exempt list #1" am: ef85febe6a am: 7380d36ae3 am: 7a07e92303 am: 5ea7bf3c6b am: 8f7f56ff3c

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

Change-Id: I1a636204c61a7ae4f87dee140964a39cd534a4a4

compatibility_matrices/exclude/fcm_exclude.cpp

diff --git a/compatibility_matrices/exclude/fcm_exclude.cpp b/compatibility_matrices/exclude/fcm_exclude.cpp
index 7a6ea2b..50653a1 100644
--- a/compatibility_matrices/exclude/fcm_exclude.cpp
+++ b/compatibility_matrices/exclude/fcm_exclude.cpp
@@ -33,12 +33,12 @@
     };
 
     static std::vector<std::string> excluded_prefixes{
-            // TODO(b/110261831): reduce items in this list
-            "android.hardware.gnss.measurement_corrections@",
+            // Packages without top level interfaces (including types-only packages) are exempted.
+            "android.hardware.camera.device@",
+            "android.hardware.gnss.measurement_corrections@1.",
             "android.hardware.graphics.bufferqueue@",
 
-            // Exempted.
-            "android.hardware.camera.device@",
+            // Test packages are exempted.
             "android.hardware.tests.",
     };
 
@@ -46,20 +46,21 @@
             // TODO(b/110261831): reduce items in this list
             "android.hardware.audio@7.0",
             "android.hardware.audio.effect@7.0",
-            "android.hardware.biometrics.fingerprint@2.3",
-            "android.hardware.cas.native@1.0",
             "android.hardware.fastboot@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",
             "android.hardware.tv.cec@2.0",
             "android.hardware.tv.tuner@1.0",
-            "android.hardware.keymaster",
 
-            // Exempted
+            // Packages without top level interfaces (including types-only packages) are exempted.
+            // HIDL
+            "android.hardware.cas.native@1.0",
+            "android.hardware.gnss.visibility_control@1.0",
+            "android.hardware.radio.config@1.2",
+            // AIDL
             "android.hardware.common",
             "android.hardware.graphics.common",
+            "android.hardware.keymaster",
     };
 
     auto package_has_prefix = [&](const std::string& prefix) {