commit 08c0142b21dffeba00d493756e22973cad276ae4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 17 06:13:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 17 06:13:34 2020 +0000
tree 8463053e8f4b60d28db0f40c8e72629c204ff730
parent 19cc21ea4125112483eda69529daf7e84e7c0018
parent bd5a47d5ddb8229c77860331dd1b4d02cf1d3fa3

Merge "wifi: Added capability check in RTT tests"

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) {

tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp

diff --git a/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp b/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp
index 59c70eb..8092d5e 100644
--- a/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp
+++ b/tv/input/1.0/vts/functional/VtsHalTvInputV1_0TargetTest.cpp
@@ -337,3 +337,6 @@
         PerInstance, TvInputHidlTest,
         testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITvInput::descriptor)),
         android::hardware::PrintInstanceNameToString);
+
+// TODO remove from the allow list once the cf tv target is enabled for testing
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TvInputHidlTest);

wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp

diff --git a/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp b/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp
index 9587776..62e3c16 100644
--- a/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp
+++ b/wifi/hostapd/1.2/vts/functional/hostapd_hidl_test.cpp
@@ -72,7 +72,7 @@
             "wifi_softap_wpa3_sae_supported");
     }
 
-    virtual void TearDown() override { stopHostapd(hostapd_instance_name_); }
+    virtual void TearDown() override { stopHostapd(wifi_instance_name_); }
 
    protected:
     bool isWpa3SaeSupport_ = false;