commit 149f4a3f9456d5fa7d1658a07a2dc9833b4e179b
author Sooraj Sasindran <sasindran@google.com> Sun Apr 11 21:44:21 2021 -0700
committer Sooraj Sasindran <sasindran@google.com> Mon Apr 12 15:07:48 2021 -0700
tree eb994fbbb948ca29d25d469e35ef21073dc664e1
parent c9945ab2b45a663d8875c709087a3dfcdaa68c95

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

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);
 

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

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}));
     }
 }