• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythongamewindowsbathyscaphephpguic翻訳omegattwitterframeworktestbtronarduinovb.net計画中(planning stage)directxpreviewerゲームエンジンdom

hardware/interfaces


Commit MetaInfo

修订版b70f1bda1f34fd63a9c9f5ad8307c8677a2f1f4d (tree)
时间2017-10-18 12:35:42
作者TreeHugger Robot <treehugger-gerrit@goog...>
CommiterAndroid (Google) Code Review

Log Message

Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-mr1-dev

更改概述

差异

--- a/current.txt
+++ b/current.txt
@@ -227,6 +227,7 @@ c26473e2e4a00af43e28a0ddf9002e5062a7d0940429e5efb6e5513a8abcb75c android.hardwar
227227 b056e1defab4071584214584057d0bc73a613081bf1152590549649d4582c13c android.hardware.wifi@1.1::IWifiChip
228228
229229 # ABI preserving changes to HALs during Android O MR1 (Final Set)
230+2d833aeed0cd1d59437aca210be590a953cf32bcb6683cd63d089762a643fb49 android.hardware.radio@1.0::IRadioResponse
230231 05aa3de6130a9788fdb6f4d3cc57c3ea90f067e77a5e09d6a772ec7f6bca33d2 android.hardware.radio@1.1::IRadioResponse
231232
232233 # HALs released in Android O MR1 (Final Set)
--- a/radio/1.0/IRadioResponse.hal
+++ b/radio/1.0/IRadioResponse.hal
@@ -1190,6 +1190,7 @@ interface IRadioResponse {
11901190 * RadioError:REQUEST_NOT_SUPPORTED
11911191 * RadioError:NO_RESOURCES
11921192 * RadioError:CANCELLED
1193+ * RadioError:SIM_ABSENT
11931194 */
11941195 oneway setSuppServiceNotificationsResponse(RadioResponseInfo info);
11951196
@@ -1295,6 +1296,7 @@ interface IRadioResponse {
12951296 * RadioError:INVALID_ARGUMENTS
12961297 * RadioError:MODEM_ERR
12971298 * RadioError:REQUEST_NOT_SUPPORTED
1299+ * RadioError:SIM_ABSENT
12981300 */
12991301 oneway sendEnvelopeResponse(RadioResponseInfo info, string commandResponse);
13001302
@@ -1312,6 +1314,7 @@ interface IRadioResponse {
13121314 * RadioError:CANCELLED
13131315 * RadioError:INVALID_MODEM_STATE
13141316 * RadioError:REQUEST_NOT_SUPPORTED
1317+ * RadioError:SIM_ABSENT
13151318 */
13161319 oneway sendTerminalResponseToSimResponse(RadioResponseInfo info);
13171320
@@ -1329,6 +1332,7 @@ interface IRadioResponse {
13291332 * RadioError:NO_RESOURCES
13301333 * RadioError:CANCELLED
13311334 * RadioError:REQUEST_NOT_SUPPORTED
1335+ * RadioError:SIM_ABSENT
13321336 */
13331337 oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);
13341338
@@ -1425,6 +1429,7 @@ interface IRadioResponse {
14251429 * RadioError:REQUEST_NOT_SUPPORTED
14261430 * RadioError:NO_RESOURCES
14271431 * RadioError:CANCELLED
1432+ * RadioError:SIM_ABSENT
14281433 */
14291434 oneway setLocationUpdatesResponse(RadioResponseInfo info);
14301435
@@ -1459,6 +1464,7 @@ interface IRadioResponse {
14591464 * RadioError:OPERATION_NOT_ALLOWED
14601465 * RadioError:NO_RESOURCES
14611466 * RadioError:CANCELLED
1467+ * RadioError:SIM_ABSENT
14621468 */
14631469 oneway setCdmaRoamingPreferenceResponse(RadioResponseInfo info);
14641470
@@ -1477,6 +1483,7 @@ interface IRadioResponse {
14771483 * RadioError:REQUEST_NOT_SUPPORTED
14781484 * RadioError:NO_RESOURCES
14791485 * RadioError:CANCELLED
1486+ * RadioError:SIM_ABSENT
14801487 */
14811488 oneway getCdmaRoamingPreferenceResponse(RadioResponseInfo info, CdmaRoamingType type);
14821489
@@ -1801,6 +1808,7 @@ interface IRadioResponse {
18011808 * RadioError:REQUEST_NOT_SUPPORTED
18021809 * RadioError:NO_RESOURCES
18031810 * RadioError:CANCELLED
1811+ * RadioError:SIM_ABSENT
18041812 */
18051813 oneway getCDMASubscriptionResponse(RadioResponseInfo info, string mdn, string hSid,
18061814 string hNid, string min, string prl);
@@ -1896,6 +1904,7 @@ interface IRadioResponse {
18961904 * RadioError:REQUEST_NOT_SUPPORTED
18971905 * RadioError:NO_RESOURCES
18981906 * RadioError:CANCELLED
1907+ * RadioError:SIM_ABSENT
18991908 */
19001909 oneway exitEmergencyCallbackModeResponse(RadioResponseInfo info);
19011910
@@ -1991,6 +2000,7 @@ interface IRadioResponse {
19912000 * RadioError:NO_RESOURCES
19922001 * RadioError:CANCELLED
19932002 * RadioError:REQUEST_NOT_SUPPORTED
2003+ * RadioError:SIM_ABSENT
19942004 */
19952005 oneway getCdmaSubscriptionSourceResponse(RadioResponseInfo info, CdmaSubscriptionSource source);
19962006
@@ -2008,6 +2018,7 @@ interface IRadioResponse {
20082018 * RadioError:INVALID_MODEM_STATE
20092019 * RadioError:INVALID_ARGUMENTS
20102020 * RadioError:REQUEST_NOT_SUPPORTED
2021+ * RadioError:SIM_ABSENT
20112022 */
20122023 oneway requestIsimAuthenticationResponse(RadioResponseInfo info, string response);
20132024
--- a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
@@ -155,7 +155,8 @@ TEST_F(RadioHidlTest, setSuppServiceNotifications) {
155155 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
156156
157157 if (cardStatus.cardState == CardState::ABSENT) {
158- EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
158+ ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
159+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
159160 }
160161 }
161162
@@ -173,7 +174,7 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) {
173174 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
174175
175176 if (cardStatus.cardState == CardState::ABSENT) {
176- ASSERT_TRUE(CheckGeneralError());
177+ ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
177178 }
178179 }
179180
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -265,7 +265,8 @@ TEST_F(RadioHidlTest, setLocationUpdates) {
265265 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
266266
267267 if (cardStatus.cardState == CardState::ABSENT) {
268- ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
268+ ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
269+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
269270 }
270271 }
271272
@@ -282,7 +283,8 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) {
282283
283284 if (cardStatus.cardState == CardState::ABSENT) {
284285 ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
285- radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
286+ radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||
287+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
286288 }
287289 }
288290
@@ -299,7 +301,8 @@ TEST_F(RadioHidlTest, getCdmaRoamingPreference) {
299301
300302 if (cardStatus.cardState == CardState::ABSENT) {
301303 ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE ||
302- radioRsp->rspInfo.error == RadioError::MODEM_ERR);
304+ radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
305+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
303306 }
304307 }
305308
@@ -381,7 +384,9 @@ TEST_F(RadioHidlTest, getCDMASubscription) {
381384 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
382385
383386 if (cardStatus.cardState == CardState::ABSENT) {
384- ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
387+ ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
388+ radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||
389+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
385390 }
386391 }
387392
@@ -414,7 +419,9 @@ TEST_F(RadioHidlTest, exitEmergencyCallbackMode) {
414419 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
415420
416421 if (cardStatus.cardState == CardState::ABSENT) {
417- ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
422+ ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
423+ radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||
424+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
418425 }
419426 }
420427
@@ -430,7 +437,9 @@ TEST_F(RadioHidlTest, getCdmaSubscriptionSource) {
430437 EXPECT_EQ(serial, radioRsp->rspInfo.serial);
431438
432439 if (cardStatus.cardState == CardState::ABSENT) {
433- ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
440+ ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
441+ radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||
442+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
434443 }
435444 }
436445
--- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
@@ -38,7 +38,8 @@ TEST_F(RadioHidlTest, sendEnvelope) {
3838 ASSERT_TRUE(CheckGeneralError() ||
3939 radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
4040 radioRsp->rspInfo.error == RadioError::NONE ||
41- radioRsp->rspInfo.error == RadioError::MODEM_ERR);
41+ radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
42+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
4243 }
4344 }
4445
@@ -61,7 +62,8 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) {
6162 std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;
6263 ASSERT_TRUE(CheckGeneralError() ||
6364 radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
64- radioRsp->rspInfo.error == RadioError::NONE);
65+ radioRsp->rspInfo.error == RadioError::NONE ||
66+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
6567 }
6668 }
6769
@@ -81,7 +83,8 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) {
8183 if (cardStatus.cardState == CardState::ABSENT) {
8284 ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE ||
8385 radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
84- radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);
86+ radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
87+ radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
8588 }
8689 }
8790