Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5068a9fe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow INVALID_STATE to be returned for setNrDualConnectivity" am: be01266c 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673549

Change-Id: I7dbf54ddcb70e1036a69716b9d8a12a0df58f655
parents c9ee5dd6 be01266c

radio/1.6/IRadioResponse.hal

+1 −0
Original line number Diff line number Diff line
@@ -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);

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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}));

    }

}