From bd4a6f13df672ca0717c3435ad63a0859706e9c5 Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 15 Nov 2019 16:05:27 -0800 Subject: [PATCH] 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 | 2 +- radio/1.5/types.hal | 6 ++++-- radio/1.5/vts/functional/radio_hidl_hal_api.cpp | 6 +----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/current.txt b/current.txt index b39862184c..a63bdcc491 100644 --- a/current.txt +++ b/current.txt @@ -591,7 +591,7 @@ ce8dbe76eb9ee94b46ef98f725be992e760a5751073d4f4912484026541371f3 android.hardwar 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 diff --git a/radio/1.5/types.hal b/radio/1.5/types.hal index 216ca1f156..9ef1d3180c 100644 --- a/radio/1.5/types.hal +++ b/radio/1.5/types.hal @@ -54,7 +54,9 @@ enum SignalMeasurementType : int32_t { * 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 @@ enum AccessNetwork : @1.4::AccessNetwork { * Next-Generation Radio Access Network (NGRAN) */ NGRAN = 6, -}; \ No newline at end of file +}; 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 650ede44d2..d173411bca 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 @@ TEST_F(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_Eutran_RSSNR) 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 @@ TEST_F(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_NGRAN_SSSINR) 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 +}