| commit | 3aac3690376c60c4e904123c7fe0698e8ef9452b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 15 02:44:11 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 02:44:11 2021 +0000 |
| tree | 19947dfbc9f88ef3ec347cec9d3b8c1c077d87fb | |
| parent | 26bf51ebe6ab04a23a9b15ea8c65b1d3b8174d99 [diff] | |
| parent | 5068a9fec76fc1447a3a79e8d1b970ccb3d66b86 [diff] |
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
diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index f2c06b7..60b0edc 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 a9c21ff..87320da 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -378,6 +378,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})); } }