From 149f4a3f9456d5fa7d1658a07a2dc9833b4e179b Mon Sep 17 00:00:00 2001 From: Sooraj Sasindran Date: Sun, 11 Apr 2021 21:44:21 -0700 Subject: [PATCH] Allow INVALID_STATE to be returned for setNrDualConnectivity Allow INVALID_STATE to be returned for setNrDualConnectivity as modem may disable NR NSA for some carriers Bug: 184571795 Test: build Change-Id: Ie99ac2dd4ee33180d5ae2fa8a74ab90f533d1df4 --- radio/1.6/IRadioResponse.hal | 1 + radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index f2c06b7af1..60b0edcbdb 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -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); 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 a9c21fff47..87320da0c0 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 @@ 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})); } }