diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2018-06-25 14:16:37 -0700 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2018-08-28 15:40:38 -0700 |
| commit | 15fec86821e1bc3451a032adfa3b5e7732693a70 (patch) | |
| tree | a5c00f8dbb76bb5d72293a9a67c734c3e83429ec /radio | |
| parent | 77db79a6945021518bc703b3727f9d2a63652722 (diff) | |
| download | android_hardware_interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.tar.gz android_hardware_interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.tar.bz2 android_hardware_interfaces-15fec86821e1bc3451a032adfa3b5e7732693a70.zip | |
Allow NOT_SUPPORTED for setLinkCapacityReportingCriteria on GERAN.
Test: run vts -m VtsHalRadioV1_2Target
Bug: 110716988
Merged-In: I9a5f014d498db00d818870cbd73e119f66562ef1
Change-Id: I9a5f014d498db00d818870cbd73e119f66562ef1
(cherry picked from commit c7896501db413c9a0fa44d2697da4079610075d8)
Diffstat (limited to 'radio')
| -rw-r--r-- | radio/1.2/vts/functional/radio_hidl_hal_api.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp index 03911da6e..7a47bd52a 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -525,7 +525,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisDlK ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisDlKbps, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); + // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for + // GERAN + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } /* @@ -546,7 +550,11 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_invalidHysteresisUlK ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::INVALID_ARGUMENTS})); + // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for + // GERAN + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED})); } /* @@ -564,7 +572,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_emptyParams) { ALOGI("setLinkCapacityReportingCriteria_emptyParams, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); + // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for + // GERAN + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } /* @@ -583,7 +594,10 @@ TEST_F(RadioHidlTest_v1_2, setLinkCapacityReportingCriteria_Geran) { ALOGI("setLinkCapacityReportingCriteria_invalidHysteresisUlKbps, rspInfo.error = %s\n", toString(radioRsp_v1_2->rspInfo.error).c_str()); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, {RadioError::NONE})); + // Allow REQUEST_NOT_SUPPORTED as setLinkCapacityReportingCriteria() may not be supported for + // GERAN + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_2->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } /* |