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

Commit d9dabe6b authored by Sanket Padawe's avatar Sanket Padawe Committed by android-build-merger
Browse files

Merge "Add VTS test for misc RIL apis." 

am: 69c546ba

Change-Id: Ib4edda9c989f0b4b2c9a88e875ff723f9a775cb1
parents a6d34756 69c546ba

radio/1.0/vts/functional/Android.bp

+5 −4
Original line number Diff line number Diff line
@@ -17,15 +17,16 @@ 
cc_test {

    name: "VtsHalRadioV1_0TargetTest",

    defaults: ["hidl_defaults"],

    srcs: ["radio_hidl_hal_test.cpp",

           "radio_response.cpp",

           "radio_hidl_hal_voice.cpp",

           "radio_hidl_hal_cell_broadcast.cpp",

    srcs: ["radio_hidl_hal_cell_broadcast.cpp",

           "radio_hidl_hal_data.cpp",

           "radio_hidl_hal_icc.cpp",

           "radio_hidl_hal_ims.cpp",

           "radio_hidl_hal_misc.cpp",

           "radio_hidl_hal_sms.cpp",

           "radio_hidl_hal_stk.cpp",

           "radio_hidl_hal_test.cpp",

           "radio_hidl_hal_voice.cpp",

           "radio_response.cpp",

           "VtsHalRadioV1_0TargetTest.cpp"],

    shared_libs: [

        "libbase",

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

+16 −0
Original line number Diff line number Diff line
@@ -288,3 +288,19 @@ TEST_F(RadioHidlTest, requestIccSimAuthentication) { 
        EXPECT_EQ(RadioError::INVALID_ARGUMENTS, radioRsp->rspInfo.error);

    }

}



/*

 * Test IRadio.supplyNetworkDepersonalization() for the response returned.

 */

TEST_F(RadioHidlTest, supplyNetworkDepersonalization) {

    int serial = 1;



    radio->supplyNetworkDepersonalization(serial, hidl_string("test"));

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::PASSWORD_INCORRECT);

    }

}
 
 No newline at end of file

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

0 → 100644
+774 −0

File added.

Preview size limit exceeded, changes collapsed.

radio/1.0/vts/functional/radio_hidl_hal_utils.h

+8 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ using ::android::hardware::radio::V1_0::CardStatus; 
using ::android::hardware::radio::V1_0::CardState;

using ::android::hardware::radio::V1_0::Call;

using ::android::hardware::radio::V1_0::CallForwardInfo;

using ::android::hardware::radio::V1_0::CarrierMatchType;

using ::android::hardware::radio::V1_0::CarrierRestrictions;

using ::android::hardware::radio::V1_0::CdmaRoamingType;

using ::android::hardware::radio::V1_0::CdmaBroadcastSmsConfigInfo;
@@ -39,6 +40,7 @@ using ::android::hardware::radio::V1_0::CdmaSubscriptionSource; 
using ::android::hardware::radio::V1_0::CellInfo;

using ::android::hardware::radio::V1_0::ClipStatus;

using ::android::hardware::radio::V1_0::DataRegStateResult;

using ::android::hardware::radio::V1_0::DeviceStateType;

using ::android::hardware::radio::V1_0::Dial;

using ::android::hardware::radio::V1_0::GsmBroadcastSmsConfigInfo;

using ::android::hardware::radio::V1_0::HardwareConfig;
@@ -54,6 +56,8 @@ using ::android::hardware::radio::V1_0::LastCallFailCauseInfo; 
using ::android::hardware::radio::V1_0::LceDataInfo;

using ::android::hardware::radio::V1_0::LceStatusInfo;

using ::android::hardware::radio::V1_0::NeighboringCell;

using ::android::hardware::radio::V1_0::NvItem;

using ::android::hardware::radio::V1_0::NvWriteItem;

using ::android::hardware::radio::V1_0::OperatorInfo;

using ::android::hardware::radio::V1_0::PreferredNetworkType;

using ::android::hardware::radio::V1_0::RadioBandMode;
@@ -61,6 +65,8 @@ using ::android::hardware::radio::V1_0::RadioCapability; 
using ::android::hardware::radio::V1_0::RadioResponseType;

using ::android::hardware::radio::V1_0::RadioTechnology;

using ::android::hardware::radio::V1_0::RadioTechnologyFamily;

using ::android::hardware::radio::V1_0::ResetNvType;

using ::android::hardware::radio::V1_0::SelectUiccSub;

using ::android::hardware::radio::V1_0::SendSmsResult;

using ::android::hardware::radio::V1_0::SetupDataCallResult;

using ::android::hardware::radio::V1_0::SignalStrength;
@@ -69,11 +75,12 @@ using ::android::hardware::radio::V1_0::TtyMode; 
using ::android::hardware::radio::V1_0::VoiceRegStateResult;



using ::android::hardware::hidl_string;

using ::android::hardware::hidl_vec;

using ::android::hardware::Return;

using ::android::hardware::Void;

using ::android::sp;



#define TIMEOUT_PERIOD 20

#define TIMEOUT_PERIOD 40



class RadioHidlTest;

extern CardStatus cardStatus;

radio/1.0/vts/functional/radio_response.cpp

+141 −47
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ Return<void> RadioResponse::changeIccPin2ForAppResponse( 
}



Return<void> RadioResponse::supplyNetworkDepersonalizationResponse(

        const RadioResponseInfo& /*info*/, int32_t /*remainingRetries*/) {

        const RadioResponseInfo& info, int32_t /*remainingRetries*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -147,12 +149,16 @@ Return<void> RadioResponse::getLastCallFailCauseResponse( 
}



Return<void> RadioResponse::getSignalStrengthResponse(

        const RadioResponseInfo& /*info*/, const SignalStrength& /*sig_strength*/) {

        const RadioResponseInfo& info, const SignalStrength& /*sig_strength*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getVoiceRegistrationStateResponse(

        const RadioResponseInfo& /*info*/, const VoiceRegStateResult& /*voiceRegResponse*/) {

        const RadioResponseInfo& info, const VoiceRegStateResult& /*voiceRegResponse*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -164,13 +170,17 @@ Return<void> RadioResponse::getDataRegistrationStateResponse( 
}



Return<void> RadioResponse::getOperatorResponse(

        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*longName*/,

        const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*longName*/,

        const ::android::hardware::hidl_string& /*shortName*/,

        const ::android::hardware::hidl_string& /*numeric*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setRadioPowerResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setRadioPowerResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -302,23 +312,31 @@ Return<void> RadioResponse::setBarringPasswordResponse(const RadioResponseInfo& 
}



Return<void> RadioResponse::getNetworkSelectionModeResponse(

        const RadioResponseInfo& /*info*/, bool /*manual*/) {

        const RadioResponseInfo& info, bool /*manual*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setNetworkSelectionModeAutomaticResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setNetworkSelectionModeManualResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getAvailableNetworksResponse(

        const RadioResponseInfo& /*info*/,

        const RadioResponseInfo& info,

        const ::android::hardware::hidl_vec<OperatorInfo>& /*networkInfos*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -337,7 +355,9 @@ Return<void> RadioResponse::stopDtmfResponse( 
}



Return<void> RadioResponse::getBasebandVersionResponse(

        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*version*/) {

        const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*version*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -408,13 +428,17 @@ Return<void> RadioResponse::deleteSmsOnSimResponse( 
    return Void();

}



Return<void> RadioResponse::setBandModeResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setBandModeResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getAvailableBandModesResponse(

        const RadioResponseInfo& /*info*/,

        const RadioResponseInfo& info,

        const ::android::hardware::hidl_vec<RadioBandMode>& /*bandModes*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -444,23 +468,31 @@ Return<void> RadioResponse::explicitCallTransferResponse(const RadioResponseInfo 
    return Void();

}



Return<void> RadioResponse::setPreferredNetworkTypeResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setPreferredNetworkTypeResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getPreferredNetworkTypeResponse(

        const RadioResponseInfo& /*info*/, PreferredNetworkType /*nw_type*/) {

        const RadioResponseInfo& info, PreferredNetworkType /*nw_type*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getNeighboringCidsResponse(

        const RadioResponseInfo& /*info*/,

        const RadioResponseInfo& info,

        const ::android::hardware::hidl_vec<NeighboringCell>& /*cells*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setLocationUpdatesResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -468,30 +500,42 @@ Return<void> RadioResponse::setCdmaSubscriptionSourceResponse(const RadioRespons 
    return Void();

}



Return<void> RadioResponse::setCdmaRoamingPreferenceResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setCdmaRoamingPreferenceResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getCdmaRoamingPreferenceResponse(

        const RadioResponseInfo& /*info*/, CdmaRoamingType /*type*/) {

        const RadioResponseInfo& info, CdmaRoamingType /*type*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setTTYModeResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setTTYModeResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getTTYModeResponse(const RadioResponseInfo& /*info*/,

Return<void> RadioResponse::getTTYModeResponse(const RadioResponseInfo& info,

        TtyMode /*mode*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setPreferredVoicePrivacyResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setPreferredVoicePrivacyResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getPreferredVoicePrivacyResponse(

        const RadioResponseInfo& /*info*/, bool /*enable*/) {

        const RadioResponseInfo& info, bool /*enable*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -561,11 +605,13 @@ Return<void> RadioResponse::setCdmaBroadcastActivationResponse(const RadioRespon 
}



Return<void> RadioResponse::getCDMASubscriptionResponse(

        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*mdn*/,

        const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*mdn*/,

        const ::android::hardware::hidl_string& /*hSid*/,

        const ::android::hardware::hidl_string& /*hNid*/,

        const ::android::hardware::hidl_string& /*min*/,

        const ::android::hardware::hidl_string& /*prl*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -585,14 +631,18 @@ Return<void> RadioResponse::deleteSmsOnRuimResponse( 
}



Return<void> RadioResponse::getDeviceIdentityResponse(

        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*imei*/,

        const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*imei*/,

        const ::android::hardware::hidl_string& /*imeisv*/,

        const ::android::hardware::hidl_string& /*esn*/,

        const ::android::hardware::hidl_string& /*meid*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::exitEmergencyCallbackModeResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::exitEmergencyCallbackModeResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -623,7 +673,9 @@ Return<void> RadioResponse::reportStkServiceIsRunningResponse(const RadioRespons 
}



Return<void> RadioResponse::getCdmaSubscriptionSourceResponse(

        const RadioResponseInfo& /*info*/, CdmaSubscriptionSource /*source*/) {

        const RadioResponseInfo& info, CdmaSubscriptionSource /*source*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -649,17 +701,23 @@ Return<void> RadioResponse::sendEnvelopeWithStatusResponse( 
}



Return<void> RadioResponse::getVoiceRadioTechnologyResponse(

        const RadioResponseInfo& /*info*/, RadioTechnology /*rat*/) {

        const RadioResponseInfo& info, RadioTechnology /*rat*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getCellInfoListResponse(

        const RadioResponseInfo& /*info*/,

        const RadioResponseInfo& info,

        const ::android::hardware::hidl_vec<CellInfo>& /*cellInfo*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setCellInfoListRateResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setCellInfoListRateResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -717,23 +775,33 @@ Return<void> RadioResponse::iccTransmitApduLogicalChannelResponse( 
}



Return<void> RadioResponse::nvReadItemResponse(

        const RadioResponseInfo& /*info*/, const ::android::hardware::hidl_string& /*result*/) {

        const RadioResponseInfo& info, const ::android::hardware::hidl_string& /*result*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::nvWriteItemResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::nvWriteItemResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::nvWriteCdmaPrlResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::nvWriteCdmaPrlResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::nvResetConfigResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::nvResetConfigResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setUiccSubscriptionResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::setUiccSubscriptionResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -744,8 +812,10 @@ Return<void> RadioResponse::setDataAllowedResponse(const RadioResponseInfo& info 
}



Return<void> RadioResponse::getHardwareConfigResponse(

        const RadioResponseInfo& /*info*/,

        const RadioResponseInfo& info,

        const ::android::hardware::hidl_vec<HardwareConfig>& /*config*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}
@@ -763,63 +833,87 @@ Return<void> RadioResponse::setDataProfileResponse(const RadioResponseInfo& info 
    return Void();

}



Return<void> RadioResponse::requestShutdownResponse(const RadioResponseInfo& /*info*/) {

Return<void> RadioResponse::requestShutdownResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getRadioCapabilityResponse(

        const RadioResponseInfo& /*info*/, const RadioCapability& /*rc*/) {

        const RadioResponseInfo& info, const RadioCapability& /*rc*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setRadioCapabilityResponse(

        const RadioResponseInfo& /*info*/, const RadioCapability& /*rc*/) {

        const RadioResponseInfo& info, const RadioCapability& /*rc*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::startLceServiceResponse(

        const RadioResponseInfo& /*info*/, const LceStatusInfo& /*statusInfo*/) {

        const RadioResponseInfo& info, const LceStatusInfo& /*statusInfo*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::stopLceServiceResponse(

        const RadioResponseInfo& /*info*/, const LceStatusInfo& /*statusInfo*/) {

        const RadioResponseInfo& info, const LceStatusInfo& /*statusInfo*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::pullLceDataResponse(

        const RadioResponseInfo& /*info*/, const LceDataInfo& /*lceInfo*/) {

        const RadioResponseInfo& info, const LceDataInfo& /*lceInfo*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getModemActivityInfoResponse(

        const RadioResponseInfo& /*info*/, const ActivityStatsInfo& /*activityInfo*/) {

        const RadioResponseInfo& info, const ActivityStatsInfo& /*activityInfo*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setAllowedCarriersResponse(

        const RadioResponseInfo& /*info*/, int32_t /*numAllowed*/) {

        const RadioResponseInfo& info, int32_t /*numAllowed*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::getAllowedCarriersResponse(

        const RadioResponseInfo& /*info*/, bool /*allAllowed*/,

        const RadioResponseInfo& info, bool /*allAllowed*/,

        const CarrierRestrictions& /*carriers*/) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::sendDeviceStateResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setIndicationFilterResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}



Return<void> RadioResponse::setSimCardPowerResponse(

        const RadioResponseInfo& /*info*/) {

        const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify();

    return Void();

}