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

am: f2c4d3677b

Change-Id: I7cd1620877e41403a5d03f552c36547d6efef36b
This commit is contained in:
Shuo Qian
2019-11-18 14:17:39 -08:00
committed by android-build-merger
3 changed files with 6 additions and 8 deletions

View File

@@ -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

View File

@@ -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,
};
};

View File

@@ -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}));
}
}