commit 5b7092f31ceaaf38297c138c6667a52456c18fcd
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 17 06:02:27 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 17 06:02:27 2017 +0000
tree 29a0bfe39b4bf250b1c4d60351ceb735724991b0
parent b83bc8776ace369dbbdb90de1b0ea434716c0b32
parent bf941ddefd035a415c0bedf91de3e5a9c5883a0d

Merge "Transfer VTS test ownership."

broadcastradio/1.2/ITuner.hal

diff --git a/broadcastradio/1.2/ITuner.hal b/broadcastradio/1.2/ITuner.hal
index cc966fc..ba97ea0 100644
--- a/broadcastradio/1.2/ITuner.hal
+++ b/broadcastradio/1.2/ITuner.hal
@@ -28,8 +28,11 @@
      * ones stated in VendorKeyValue documentation (a requirement of key
      * prefixes).
      *
-     * Results vector may not contain a result for each parameter being set,
-     * it can even be empty.
+     * For each pair in the result vector, the key must be one of the keys
+     * contained in the input (possibly with wildcards expanded), and the value
+     * must be a vendor-specific result status (i.e. the string "OK" or an error
+     * code). The implementation may choose to return an empty vector, or only
+     * return a status for a subset of the provided inputs, at its discretion.
      *
      * Application and HAL must not use keys with unknown prefix. In particular,
      * it must not place a key-value pair in results vector for unknown key from
@@ -40,7 +43,6 @@
      *
      * @param parameters Vendor-specific key-value pairs.
      * @return results Operation completion status for parameters being set.
-     *                 Value format for result status is vendor-specific.
      */
     setParameters(vec<VendorKeyValue> parameters)
             generates (vec<VendorKeyValue> results);

current.txt

diff --git a/current.txt b/current.txt
index 6d49d26..67d5ee0 100644
--- a/current.txt
+++ b/current.txt
@@ -197,6 +197,7 @@
 e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse
 6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse
 c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O
+4922dd58e89a03181ed1c48a6e118e47633b73b11090bdfed5aa920d25a7592b android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O DR
 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
 bfd81bcafa3c97519cd56ad29e9fa48e23d1d323b89dbcc85899282a8c628194 android.hardware.automotive.vehicle@2.0::types
 df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types

wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp

diff --git a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
index 30235cf..a341028 100644
--- a/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
+++ b/wifi/1.0/vts/functional/wifi_sta_iface_hidl_test.cpp
@@ -234,6 +234,11 @@
  * status code.
  */
 TEST_F(WifiStaIfaceHidlTest, EnableNDOffload) {
+   if (!isCapabilitySupported(
+           IWifiStaIface::StaIfaceCapabilityMask::ND_OFFLOAD)) {
+        // No-op if nd offload is not supported.
+        return;
+    }
     EXPECT_EQ(WifiStatusCode::SUCCESS,
               HIDL_INVOKE(wifi_sta_iface_, enableNdOffload, true).code);
 }
@@ -256,6 +261,11 @@
  * packets will return a success status code.
  */
 TEST_F(WifiStaIfaceHidlTest, PacketFateMonitoring) {
+   if (!isCapabilitySupported(
+           IWifiStaIface::StaIfaceCapabilityMask::DEBUG_PACKET_FATE)) {
+        // No-op if packet fate monitor is not supported.
+        return;
+    }
     // Start packet fate monitoring.
     EXPECT_EQ(
         WifiStatusCode::SUCCESS,