commit bd4a6f13df672ca0717c3435ad63a0859706e9c5
author sqian <shuoq@google.com> Fri Nov 15 16:05:27 2019 -0800
committer sqian <shuoq@google.com> Fri Nov 15 16:05:27 2019 -0800
tree b2712141181deb9eb746dca2a729b106feab286d
parent b2193ac0d06f3248a7015d11a588f32ebe515324

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

Test: build
Bug: 135717625
Change-Id: Iaf42797b2d388843778ce5fedbd28861f340ec5c
Merged-In: Iaf42797b2d388843778ce5fedbd28861f340ec5c
(cherry picked from commit 42f01a6477fc224d67b3112cc50a7d7d56f753f2)

current.txt

diff --git a/current.txt b/current.txt
index b398621..a63bdcc 100644
--- a/current.txt
+++ b/current.txt
@@ -591,7 +591,7 @@
 db47f4ceceb1f06c656f39caa70c557b0f8471ef59fd58611bea667ffca20101 android.hardware.health@2.1::types
 34515afa2bb792d3c6d8495a5f5d907d179c8507ca5e55c10050d02ae1d516ef android.hardware.neuralnetworks@1.3::IDevice
 b74fe72cfe438f50e772e6a307657ff449d5bde83c15dd1f140ff2edbe73499c android.hardware.neuralnetworks@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
+}