commit f96c16cd20df8418dc85b7d90eeb97b68f0f49b6
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 15 23:52:53 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 23:52:53 2019 +0000
tree 78f56cb54a8e949802fc11b901024a8cf4c3d9b1
parent a6b217d3e390d06679689f50005cc423a562be60
parent 42f01a6477fc224d67b3112cc50a7d7d56f753f2

Merge "Mark RSSNR in 4G as an optional support, and vendor dependency"

current.txt

diff --git a/current.txt b/current.txt
index dc2e6b0..26de8ff 100644
--- a/current.txt
+++ b/current.txt
@@ -607,7 +607,7 @@
 619fc9839ec6e369cfa9b28e3e9412e6885720ff8f9b5750c1b6ffb905120391 android.hardware.wifi.supplicant@1.3::ISupplicantStaIfaceCallback
 c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardware.wifi.supplicant@1.3::ISupplicantStaNetwork
 9b0a3ab6f4f74b971ed094426d8a443e29b512ff03e1ab50c07156396cdb2483 android.hardware.wifi.supplicant@1.3::types
-d3636ff9d5fef59f59f678887209156b2608d29f676fb1e600fe33b7e57a8a61 android.hardware.radio@1.5::types
+ba759fab7dd4cd621b492ef8f44312d4a716af786786f404d1477cc8cea6f392 android.hardware.radio@1.5::types
 c8e81d912827a5d49b2ddcdc4eb4556c5d231a899a1dca879309e04210daa4a0 android.hardware.radio@1.5::IRadio
 a62a93faf173b14a6175b683ebf61ffa568dc61f81e369d2dce7b1265e86cf2f android.hardware.radio@1.5::IRadioIndication
 260ce05806d753d728f844d405e832179ed7d9b65986ec18fef3d21cf7285587 android.hardware.radio@1.5::IRadioResponse

radio/1.5/types.hal

diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal
index 216ca1f..9ef1d31 100644
--- a/radio/1.5/types.hal
+++ b/radio/1.5/types.hal
@@ -54,7 +54,9 @@
      * Reference Signal Signal to Noise Ratio
      * Range: -20 dB to -30 dB;
      * Used RAN: EUTRAN
-     * Reference: 3GPP TS 36.101 8.1.1
+     * Note: this field is optional; how to support it can be decided by the
+     * corresponding vendor. Though the response code is not enforced,
+     * vendor's implementation must ensure this interface not crashing.
      */
     RSSNR = 5,
     /**
@@ -111,4 +113,4 @@
      *  Next-Generation Radio Access Network (NGRAN)
      */
     NGRAN = 6,
-};
\ No newline at end of file
+};

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
index 650ede4..d173411 100644
--- a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp
@@ -179,10 +179,6 @@
     EXPECT_EQ(std::cv_status::no_timeout, wait());
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_5->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_v1_5->rspInfo.serial);
-
-    ALOGI("setSignalStrengthReportingCriteria_1_5_Eutran, rspInfo.error = %s\n",
-          toString(radioRsp_v1_5->rspInfo.error).c_str());
-    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));
 }
 
 /*
@@ -279,4 +275,4 @@
     ALOGI("setSignalStrengthReportingCriteria_1_5_NGRAN_SSSINR, rspInfo.error = %s\n",
           toString(radioRsp_v1_5->rspInfo.error).c_str());
     ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));
-}
\ No newline at end of file
+}