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

Commit ef4abb83 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by Android (Google) Code Review
Browse files

Merge "Add INVALID_STATE to list of errors for when there is only one modem available" into qt-dev

parents e4be4c97 52b35030

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ abf98c2ae08bf765db54edc8068e36d52eb558cff6706b6fd7c18c65a1f3fc18 android.hardwar 
a1c6b0761bcb89d6bf15a156f9306b8090b3a916a15fea1689b4b0c1738e382f android.hardware.radio@1.3::IRadio

e9d0f11a52715f5a29d89e2d8e2e21db1e16a43174af6b9d51a62d705cda1455 android.hardware.radio@1.3::IRadioIndication

d233f0da44f55fdef0a95db5229231412787bb67695cd1ea197ce89a3c2908b9 android.hardware.radio@1.3::IRadioResponse

f5fbe4f28a9e346be36063eca4e6c864114a1a6fb64884db03fdd825791ad9b8 android.hardware.radio@1.3::IRadioResponse # b/132818184 for Android Q

750a363c8cec70baa1aac19e275c15233c5898e93c6bb5155fa2ca7f365490dc android.hardware.radio@1.3::types

ef4ab741f7e7762fb45e2e24ca83871f72006ce05f57aa9addc574893dd29872 android.hardware.radio@1.4::IRadio

33d9e6895cca98aa56296bb01720d18b8acd0e4de4960beb712e63ad147438a5 android.hardware.radio@1.4::IRadioIndication

radio/1.3/IRadioResponse.hal

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ interface IRadioResponse extends @1.2::IRadioResponse { 
     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:INVALID_STATE: this is for the case that the API is called in a single-sim

     *              mode, or when there is only one modem available, as this API should only

     *              be called in multi sim status.

     */

    oneway enableModemResponse(RadioResponseInfo info);

radio/1.3/vts/functional/radio_hidl_hal_api.cpp

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ TEST_F(RadioHidlTest_v1_3, enableModem) { 
          toString(radioRsp_v1_3->rspInfo.error).c_str());

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_3->rspInfo.error,

                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                  RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

                                  RadioError::MODEM_ERR, RadioError::INVALID_STATE}));



    // checking if getModemStackStatus returns true, as modem was enabled above

    if (RadioError::NONE == radioRsp_v1_3->rspInfo.error) {
@@ -52,7 +52,7 @@ TEST_F(RadioHidlTest_v1_3, enableModem) { 
              toString(radioRsp_v1_3->rspInfo.error).c_str());

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_3->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

                                      RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

                                      RadioError::MODEM_ERR, RadioError::INVALID_STATE}));

        // verify that enableModem did set isEnabled correctly

        EXPECT_EQ(true, radioRsp_v1_3->isModemEnabled);

    }