commit | 5068a9fec76fc1447a3a79e8d1b970ccb3d66b86 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 15 01:46:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 15 01:46:26 2021 +0000 |
tree | 537829ba8c85eb867259e7def00cc69837518e09 | |
parent | c9ee5dd61576a906b6dccb34e8e2b6e19621b263 [diff] | |
parent | be01266c6311c87b5169315ee2720bfe21f9f46b [diff] |
Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity" am: be01266c63 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673549 Change-Id: I7dbf54ddcb70e1036a69716b9d8a12a0df58f655
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})); } }