Implement RadioNetwork for AIDL-HIDL Telephony HAL translator (70ac7bfb) · Commits · e / os / android_hardware_interfaces

radio/aidl/compat/libradiocompat/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ cc_library {
		"android.hardware.radio.config@1.3",
		"android.hardware.radio.data-V1-ndk",
		"android.hardware.radio.messaging-V1-ndk",
		"android.hardware.radio.network-V1-ndk",
		"android.hardware.radio.sim-V1-ndk",
		"android.hardware.radio@1.0",
		"android.hardware.radio@1.1",
		@@ -69,6 +70,11 @@ cc_library {
		"messaging/RadioMessaging.cpp",
		"messaging/RadioResponse-messaging.cpp",
		"messaging/structs.cpp",
		"network/RadioIndication-network.cpp",
		"network/RadioNetwork.cpp",
		"network/RadioResponse-network.cpp",
		"network/structs.cpp",
		"network/utils.cpp",
		"sim/RadioIndication-sim.cpp",
		"sim/RadioResponse-sim.cpp",
		"sim/RadioSim.cpp",

radio/aidl/compat/libradiocompat/RadioIndication.cpp

+0 −145

Original line number	Diff line number	Diff line
		@@ -30,25 +30,6 @@ Return<void> RadioIndication::callStateChanged(V1_0::RadioIndicationType type) {
		return {};
		}

		Return<void> RadioIndication::networkStateChanged(V1_0::RadioIndicationType type) {
		return {};
		}

		Return<void> RadioIndication::nitzTimeReceived(V1_0::RadioIndicationType type,
		const hidl_string& nitzTime, uint64_t receivedTime) {
		return {};
		}

		Return<void> RadioIndication::currentSignalStrength(V1_0::RadioIndicationType type,
		const V1_0::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioIndication::suppSvcNotify(V1_0::RadioIndicationType type,
		const V1_0::SuppSvcNotification& suppSvc) {
		return {};
		}

		Return<void> RadioIndication::stkCallSetup(V1_0::RadioIndicationType type, int64_t timeout) {
		return {};
		}
		@@ -58,11 +39,6 @@ Return<void> RadioIndication::callRing(V1_0::RadioIndicationType type, bool isGs
		return {};
		}

		Return<void> RadioIndication::restrictedStateChanged(V1_0::RadioIndicationType type,
		V1_0::PhoneRestrictedState state) {
		return {};
		}

		Return<void> RadioIndication::enterEmergencyCallbackMode(V1_0::RadioIndicationType type) {
		return {};
		}
		@@ -90,10 +66,6 @@ Return<void> RadioIndication::resendIncallMute(V1_0::RadioIndicationType type) {
		return {};
		}

		Return<void> RadioIndication::cdmaPrlChanged(V1_0::RadioIndicationType type, int32_t version) {
		return {};
		}

		Return<void> RadioIndication::exitEmergencyCallbackMode(V1_0::RadioIndicationType type) {
		return {};
		}
		@@ -102,20 +74,6 @@ Return<void> RadioIndication::rilConnected(V1_0::RadioIndicationType type) {
		return {};
		}

		Return<void> RadioIndication::voiceRadioTechChanged(V1_0::RadioIndicationType type,
		V1_0::RadioTechnology rat) {
		return {};
		}

		Return<void> RadioIndication::cellInfoList(V1_0::RadioIndicationType type,
		const hidl_vec<V1_0::CellInfo>& records) {
		return {};
		}

		Return<void> RadioIndication::imsNetworkStateChanged(V1_0::RadioIndicationType type) {
		return {};
		}

		Return<void> RadioIndication::srvccStateNotify(V1_0::RadioIndicationType type,
		V1_0::SrvccState state) {
		return {};
		@@ -141,117 +99,14 @@ Return<void> RadioIndication::stkCallControlAlphaNotify(V1_0::RadioIndicationTyp
		return {};
		}

		Return<void> RadioIndication::lceData(V1_0::RadioIndicationType type,
		const V1_0::LceDataInfo& lce) {
		return {};
		}

		Return<void> RadioIndication::modemReset(V1_0::RadioIndicationType type,
		const hidl_string& reason) {
		return {};
		}

		Return<void> RadioIndication::networkScanResult(V1_0::RadioIndicationType type,
		const V1_1::NetworkScanResult& result) {
		return {};
		}

		Return<void> RadioIndication::networkScanResult_1_2(V1_0::RadioIndicationType type,
		const V1_2::NetworkScanResult& result) {
		return {};
		}

		Return<void> RadioIndication::cellInfoList_1_2(V1_0::RadioIndicationType type,
		const hidl_vec<V1_2::CellInfo>& records) {
		return {};
		}

		Return<void> RadioIndication::currentLinkCapacityEstimate(V1_0::RadioIndicationType type,
		const V1_2::LinkCapacityEstimate& lce) {
		return {};
		}

		Return<void> RadioIndication::currentPhysicalChannelConfigs(
		V1_0::RadioIndicationType type, const hidl_vec<V1_2::PhysicalChannelConfig>& configs) {
		return {};
		}

		Return<void> RadioIndication::currentSignalStrength_1_2(
		V1_0::RadioIndicationType type, const V1_2::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioIndication::currentEmergencyNumberList(
		V1_0::RadioIndicationType type, const hidl_vec<V1_4::EmergencyNumber>& emergencyNumbers) {
		return {};
		}

		Return<void> RadioIndication::cellInfoList_1_4(V1_0::RadioIndicationType type,
		const hidl_vec<V1_4::CellInfo>& records) {
		return {};
		}

		Return<void> RadioIndication::networkScanResult_1_4(V1_0::RadioIndicationType type,
		const V1_4::NetworkScanResult& result) {
		return {};
		}

		Return<void> RadioIndication::currentPhysicalChannelConfigs_1_4(
		V1_0::RadioIndicationType type, const hidl_vec<V1_4::PhysicalChannelConfig>& configs) {
		return {};
		}

		Return<void> RadioIndication::currentSignalStrength_1_4(
		V1_0::RadioIndicationType type, const V1_4::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioIndication::registrationFailed( //
		V1_0::RadioIndicationType type, const V1_5::CellIdentity& cellIdentity,
		const hidl_string& chosenPlmn, hidl_bitfield<V1_5::Domain> domain, int32_t causeCode,
		int32_t additionalCauseCode) {
		return {};
		}

		Return<void> RadioIndication::barringInfoChanged(V1_0::RadioIndicationType type,
		const V1_5::CellIdentity& cellIdentity,
		const hidl_vec<V1_5::BarringInfo>& barringInfos) {
		return {};
		}

		Return<void> RadioIndication::cellInfoList_1_5(V1_0::RadioIndicationType type,
		const hidl_vec<V1_5::CellInfo>& records) {
		return {};
		}

		Return<void> RadioIndication::networkScanResult_1_5(V1_0::RadioIndicationType type,
		const V1_5::NetworkScanResult& result) {
		return {};
		}

		Return<void> RadioIndication::currentLinkCapacityEstimate_1_6(
		V1_0::RadioIndicationType type, const V1_6::LinkCapacityEstimate& lce) {
		return {};
		}

		Return<void> RadioIndication::currentSignalStrength_1_6(
		V1_0::RadioIndicationType type, const V1_6::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioIndication::cellInfoList_1_6(V1_0::RadioIndicationType type,
		const hidl_vec<V1_6::CellInfo>& records) {
		return {};
		}

		Return<void> RadioIndication::networkScanResult_1_6(V1_0::RadioIndicationType type,
		const V1_6::NetworkScanResult& result) {
		return {};
		}

		Return<void> RadioIndication::currentPhysicalChannelConfigs_1_6(
		V1_0::RadioIndicationType type, const hidl_vec<V1_6::PhysicalChannelConfig>& configs) {
		return {};
		}

		} // namespace android::hardware::radio::compat

radio/aidl/compat/libradiocompat/RadioResponse.cpp

+1 −298

Original line number	Diff line number	Diff line
		@@ -30,15 +30,11 @@ Return<void> RadioResponse::acknowledgeRequest(int32_t serial) {
		// TODO(b/203699028): send to correct requestor or confirm if spam is not a problem
		if (mDataCb) mDataCb->acknowledgeRequest(serial);
		if (mMessagingCb) mMessagingCb->acknowledgeRequest(serial);
		if (mNetworkCb) mNetworkCb->acknowledgeRequest(serial);
		if (mSimCb) mSimCb->acknowledgeRequest(serial);
		return {};
		}

		Return<void> RadioResponse::supplyNetworkDepersonalizationResponse(
		const V1_0::RadioResponseInfo& info, int32_t remainingRetries) {
		return {};
		}

		Return<void> RadioResponse::getCurrentCallsResponse(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_0::Call>& calls) {
		return {};
		@@ -79,27 +75,6 @@ Return<void> RadioResponse::getLastCallFailCauseResponse(
		return {};
		}

		Return<void> RadioResponse::getSignalStrengthResponse(const V1_0::RadioResponseInfo& info,
		const V1_0::SignalStrength& sigStrength) {
		return {};
		}

		Return<void> RadioResponse::getVoiceRegistrationStateResponse(
		const V1_0::RadioResponseInfo& info, const V1_0::VoiceRegStateResult& voiceRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getDataRegistrationStateResponse(
		const V1_0::RadioResponseInfo& info, const V1_0::DataRegStateResult& dataRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getOperatorResponse( //
		const V1_0::RadioResponseInfo& info, const hidl_string& longName,
		const hidl_string& shortName, const hidl_string& numeric) {
		return {};
		}

		Return<void> RadioResponse::setRadioPowerResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}
		@@ -139,30 +114,6 @@ Return<void> RadioResponse::acceptCallResponse(const V1_0::RadioResponseInfo& in
		return {};
		}

		Return<void> RadioResponse::setBarringPasswordResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getNetworkSelectionModeResponse(const V1_0::RadioResponseInfo& info,
		bool manual) {
		return {};
		}

		Return<void> RadioResponse::setNetworkSelectionModeAutomaticResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setNetworkSelectionModeManualResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getAvailableNetworksResponse(
		const V1_0::RadioResponseInfo& info, const hidl_vec<V1_0::OperatorInfo>& networkInfos) {
		return {};
		}

		Return<void> RadioResponse::startDtmfResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}
		@@ -193,20 +144,6 @@ Return<void> RadioResponse::getClipResponse(const V1_0::RadioResponseInfo& info,
		return {};
		}

		Return<void> RadioResponse::setSuppServiceNotificationsResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setBandModeResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getAvailableBandModesResponse(
		const V1_0::RadioResponseInfo& info, const hidl_vec<V1_0::RadioBandMode>& bandModes) {
		return {};
		}

		Return<void> RadioResponse::handleStkCallSetupRequestFromSimResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		@@ -216,33 +153,6 @@ Return<void> RadioResponse::explicitCallTransferResponse(const V1_0::RadioRespon
		return {};
		}

		Return<void> RadioResponse::setPreferredNetworkTypeResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getPreferredNetworkTypeResponse(const V1_0::RadioResponseInfo& info,
		V1_0::PreferredNetworkType nwType) {
		return {};
		}

		Return<void> RadioResponse::getNeighboringCidsResponse(
		const V1_0::RadioResponseInfo& info, const hidl_vec<V1_0::NeighboringCell>& cells) {
		return {};
		}

		Return<void> RadioResponse::setLocationUpdatesResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setCdmaRoamingPreferenceResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getCdmaRoamingPreferenceResponse(const V1_0::RadioResponseInfo& info,
		V1_0::CdmaRoamingType type) {
		return {};
		}

		Return<void> RadioResponse::setTTYModeResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}
		@@ -279,25 +189,6 @@ Return<void> RadioResponse::exitEmergencyCallbackModeResponse(const V1_0::RadioR
		return {};
		}

		Return<void> RadioResponse::getVoiceRadioTechnologyResponse(const V1_0::RadioResponseInfo& info,
		V1_0::RadioTechnology rat) {
		return {};
		}

		Return<void> RadioResponse::getCellInfoListResponse(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_0::CellInfo>& cellInfo) {
		return {};
		}

		Return<void> RadioResponse::setCellInfoListRateResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getImsRegistrationStateResponse( //
		const V1_0::RadioResponseInfo& info, bool isRegd, V1_0::RadioTechnologyFamily ratFamily) {
		return {};
		}

		Return<void> RadioResponse::nvReadItemResponse(const V1_0::RadioResponseInfo& info,
		const hidl_string& result) {
		return {};
		@@ -334,21 +225,6 @@ Return<void> RadioResponse::setRadioCapabilityResponse(const V1_0::RadioResponse
		return {};
		}

		Return<void> RadioResponse::startLceServiceResponse(const V1_0::RadioResponseInfo& info,
		const V1_0::LceStatusInfo& statusInfo) {
		return {};
		}

		Return<void> RadioResponse::stopLceServiceResponse(const V1_0::RadioResponseInfo& info,
		const V1_0::LceStatusInfo& statusInfo) {
		return {};
		}

		Return<void> RadioResponse::pullLceDataResponse(const V1_0::RadioResponseInfo& info,
		const V1_0::LceDataInfo& lceInfo) {
		return {};
		}

		Return<void> RadioResponse::getModemActivityInfoResponse(
		const V1_0::RadioResponseInfo& info, const V1_0::ActivityStatsInfo& activityInfo) {
		return {};
		@@ -358,58 +234,11 @@ Return<void> RadioResponse::sendDeviceStateResponse(const V1_0::RadioResponseInf
		return {};
		}

		Return<void> RadioResponse::setIndicationFilterResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::startNetworkScanResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::stopNetworkScanResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getCellInfoListResponse_1_2(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_2::CellInfo>& cellInfo) {
		return {};
		}

		Return<void> RadioResponse::setSignalStrengthReportingCriteriaResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setLinkCapacityReportingCriteriaResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getCurrentCallsResponse_1_2(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_2::Call>& calls) {
		return {};
		}

		Return<void> RadioResponse::getSignalStrengthResponse_1_2(
		const V1_0::RadioResponseInfo& info, const V1_2::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioResponse::getVoiceRegistrationStateResponse_1_2(
		const V1_0::RadioResponseInfo& info, const V1_2::VoiceRegStateResult& voiceRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getDataRegistrationStateResponse_1_2(
		const V1_0::RadioResponseInfo& info, const V1_2::DataRegStateResult& dataRegResponse) {
		return {};
		}

		Return<void> RadioResponse::setSystemSelectionChannelsResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::enableModemResponse(const V1_0::RadioResponseInfo& info) {
		return {};
		}
		@@ -423,140 +252,14 @@ Return<void> RadioResponse::emergencyDialResponse(const V1_0::RadioResponseInfo&
		return {};
		}

		Return<void> RadioResponse::startNetworkScanResponse_1_4(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getCellInfoListResponse_1_4(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_4::CellInfo>& cellInfo) {
		return {};
		}

		Return<void> RadioResponse::getDataRegistrationStateResponse_1_4(
		const V1_0::RadioResponseInfo& info, const V1_4::DataRegStateResult& dataRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getPreferredNetworkTypeBitmapResponse(
		const V1_0::RadioResponseInfo& info,
		hidl_bitfield<V1_4::RadioAccessFamily> networkTypeBitmap) {
		return {};
		}

		Return<void> RadioResponse::setPreferredNetworkTypeBitmapResponse(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getSignalStrengthResponse_1_4(
		const V1_0::RadioResponseInfo& info, const V1_4::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioResponse::setSignalStrengthReportingCriteriaResponse_1_5(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setLinkCapacityReportingCriteriaResponse_1_5(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setSystemSelectionChannelsResponse_1_5(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::startNetworkScanResponse_1_5(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setRadioPowerResponse_1_5(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setIndicationFilterResponse_1_5(const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getBarringInfoResponse(
		const V1_0::RadioResponseInfo& info, const V1_5::CellIdentity& cellIdentity,
		const hidl_vec<V1_5::BarringInfo>& barringInfos) {
		return {};
		}

		Return<void> RadioResponse::getVoiceRegistrationStateResponse_1_5(
		const V1_0::RadioResponseInfo& info, const V1_5::RegStateResult& voiceRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getDataRegistrationStateResponse_1_5(
		const V1_0::RadioResponseInfo& info, const V1_5::RegStateResult& dataRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getCellInfoListResponse_1_5(const V1_0::RadioResponseInfo& info,
		const hidl_vec<V1_5::CellInfo>& cellInfo) {
		return {};
		}

		Return<void> RadioResponse::setNetworkSelectionModeManualResponse_1_5(
		const V1_0::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setRadioPowerResponse_1_6(const V1_6::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::setNrDualConnectivityStateResponse(
		const V1_6::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::isNrDualConnectivityEnabledResponse(const V1_6::RadioResponseInfo& info,
		bool isEnabled) {
		return {};
		}

		Return<void> RadioResponse::setAllowedNetworkTypesBitmapResponse(
		const V1_6::RadioResponseInfo& info) {
		return {};
		}

		Return<void> RadioResponse::getAllowedNetworkTypesBitmapResponse(
		const V1_6::RadioResponseInfo& info,
		hidl_bitfield<V1_4::RadioAccessFamily> networkTypeBitmap) {
		return {};
		}

		Return<void> RadioResponse::getSystemSelectionChannelsResponse(
		const V1_6::RadioResponseInfo& info,
		const hidl_vec<V1_5::RadioAccessSpecifier>& specifiers) {
		return {};
		}

		Return<void> RadioResponse::getCellInfoListResponse_1_6(const V1_6::RadioResponseInfo& info,
		const hidl_vec<V1_6::CellInfo>& cellInfo) {
		return {};
		}

		Return<void> RadioResponse::getSignalStrengthResponse_1_6(
		const V1_6::RadioResponseInfo& info, const V1_6::SignalStrength& signalStrength) {
		return {};
		}

		Return<void> RadioResponse::getVoiceRegistrationStateResponse_1_6(
		const V1_6::RadioResponseInfo& info, const V1_6::RegStateResult& voiceRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getDataRegistrationStateResponse_1_6(
		const V1_6::RadioResponseInfo& info, const V1_6::RegStateResult& dataRegResponse) {
		return {};
		}

		Return<void> RadioResponse::getCurrentCallsResponse_1_6(const V1_6::RadioResponseInfo& info,
		const hidl_vec<V1_6::Call>& calls) {
		return {};

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@

		#include <aidl/android/hardware/radio/data/IRadioDataIndication.h>
		#include <aidl/android/hardware/radio/messaging/IRadioMessagingIndication.h>
		#include <aidl/android/hardware/radio/network/IRadioNetworkIndication.h>
		#include <aidl/android/hardware/radio/sim/IRadioSimIndication.h>
		#include <android/hardware/radio/1.6/IRadioIndication.h>

		@@ -26,6 +27,7 @@ class RadioIndication : public V1_6::IRadioIndication {
		std::shared_ptr<::aidl::android::hardware::radio::data::IRadioDataIndication> mDataCb;
		std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingIndication>
		mMessagingCb;
		std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkIndication> mNetworkCb;
		std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimIndication> mSimCb;

		// IRadioIndication @ 1.0
		@@ -180,6 +182,8 @@ class RadioIndication : public V1_6::IRadioIndication {
		void setResponseFunction(
		std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingIndication>
		radioMessagingIndication);
		void setResponseFunction(
		std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkIndication> ni);
		void setResponseFunction(
		std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimIndication> simCb);
		};

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h

0 → 100644

+96 −0

File added.

Preview size limit exceeded, changes collapsed.