Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity" am: be01266c63 am: 5068a9fec7

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673549

Change-Id: I647e9d0cc2fbcadd6688ed55c2c69a1f539e58cc
This commit is contained in:
Treehugger Robot 2021-04-15 02:44:11 +00:00 committed by Automerger Merge Worker
commit 3aac369037
2 changed files with 2 additions and 0 deletions

View file

@ -232,6 +232,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:INVALID_STATE
*/
oneway setNrDualConnectivityStateResponse(RadioResponseInfo info);

View file

@ -378,6 +378,7 @@ TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) {
CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
::android::hardware::radio::V1_6::RadioError::INVALID_STATE,
::android::hardware::radio::V1_6::RadioError::NONE}));
}
}