| commit | fe7eed56df9668f2a987c9874d5a96f950158ef0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 15 03:36:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 03:36:02 2021 +0000 |
| tree | 23ed655df9a8ec2a7a89778d2b1b8286089498de | |
| parent | a829266a058a00c546b0ab682709538725ba8f73 [diff] | |
| parent | 3aac3690376c60c4e904123c7fe0698e8ef9452b [diff] |
Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity" am: be01266c63 am: 5068a9fec7 am: 3aac369037 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673549 Change-Id: Ic2780b825dddd9fecd136ba52040bd0f2a24cd38
diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index 33fe94f..89ededa 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal
@@ -232,6 +232,7 @@ * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:INVALID_STATE */ oneway setNrDualConnectivityStateResponse(RadioResponseInfo info);
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index f092e3d..91fdf9d 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -392,6 +392,7 @@ 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})); } }