diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioConfig.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioConfig.h index bbfff61ec3..89ddea0d49 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioConfig.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioConfig.h @@ -39,8 +39,6 @@ class RadioConfig : public aidl::android::hardware::radio::config::BnRadioConfig const sp mRadioConfigResponse; const sp mRadioConfigIndication; - std::shared_ptr<::aidl::android::hardware::radio::config::IRadioConfigResponse> respond(); - ::ndk::ScopedAStatus getHalDeviceCapabilities(int32_t serial) override; ::ndk::ScopedAStatus getNumOfLiveModems(int32_t serial) override; ::ndk::ScopedAStatus getPhoneCapability(int32_t serial) override; @@ -57,6 +55,9 @@ class RadioConfig : public aidl::android::hardware::radio::config::BnRadioConfig const std::vector& slotMap) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::config::IRadioConfigResponse> respond(); + public: /** * Constructs AIDL IRadioConfig instance wrapping existing HIDL IRadioConfig instance. diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioData.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioData.h index c2c0de3b05..da19811605 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioData.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioData.h @@ -22,8 +22,6 @@ namespace android::hardware::radio::compat { class RadioData : public RadioCompatBase, public aidl::android::hardware::radio::data::BnRadioData { - std::shared_ptr<::aidl::android::hardware::radio::data::IRadioDataResponse> respond(); - ::ndk::ScopedAStatus allocatePduSessionId(int32_t serial) override; ::ndk::ScopedAStatus cancelHandover(int32_t serial, int32_t callId) override; ::ndk::ScopedAStatus deactivateDataCall( @@ -65,6 +63,9 @@ class RadioData : public RadioCompatBase, public aidl::android::hardware::radio: const ::aidl::android::hardware::radio::data::KeepaliveRequest& keepalive) override; ::ndk::ScopedAStatus stopKeepalive(int32_t serial, int32_t sessionHandle) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::data::IRadioDataResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; }; diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioMessaging.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioMessaging.h index 047f836163..1af406aa03 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioMessaging.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioMessaging.h @@ -23,8 +23,6 @@ namespace android::hardware::radio::compat { class RadioMessaging : public RadioCompatBase, public aidl::android::hardware::radio::messaging::BnRadioMessaging { - std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingResponse> respond(); - ::ndk::ScopedAStatus acknowledgeIncomingGsmSmsWithPdu(int32_t serial, bool success, const std::string& ackPdu) override; ::ndk::ScopedAStatus acknowledgeLastIncomingCdmaSms( @@ -82,6 +80,9 @@ class RadioMessaging : public RadioCompatBase, int32_t serial, const ::aidl::android::hardware::radio::messaging::SmsWriteArgs& smsWriteArgs) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; }; diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioModem.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioModem.h index fdca1244ae..beb1fb0b49 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioModem.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioModem.h @@ -23,8 +23,6 @@ namespace android::hardware::radio::compat { class RadioModem : public RadioCompatBase, public aidl::android::hardware::radio::modem::BnRadioModem { - std::shared_ptr<::aidl::android::hardware::radio::modem::IRadioModemResponse> respond(); - ::ndk::ScopedAStatus enableModem(int32_t serial, bool on) override; ::ndk::ScopedAStatus getBasebandVersion(int32_t serial) override; ::ndk::ScopedAStatus getDeviceIdentity(int32_t serial) override; @@ -54,6 +52,9 @@ class RadioModem : public RadioCompatBase, const std::shared_ptr<::aidl::android::hardware::radio::modem::IRadioModemIndication>& radioModemIndication) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::modem::IRadioModemResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; }; diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index 1731b78851..9784665ef7 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h @@ -23,8 +23,6 @@ namespace android::hardware::radio::compat { class RadioNetwork : public RadioCompatBase, public aidl::android::hardware::radio::network::BnRadioNetwork { - std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond(); - ::ndk::ScopedAStatus getAllowedNetworkTypesBitmap(int32_t serial) override; ::ndk::ScopedAStatus getAvailableBandModes(int32_t serial) override; ::ndk::ScopedAStatus getAvailableNetworks(int32_t serial) override; @@ -92,6 +90,9 @@ class RadioNetwork : public RadioCompatBase, ::aidl::android::hardware::radio::network::UsageSetting usageSetting) override; ::ndk::ScopedAStatus getUsageSetting(int32_t serial) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; }; diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h index 84bb68b57f..ff91aef5fa 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h @@ -22,8 +22,6 @@ namespace android::hardware::radio::compat { class RadioSim : public RadioCompatBase, public aidl::android::hardware::radio::sim::BnRadioSim { - std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimResponse> respond(); - ::ndk::ScopedAStatus areUiccApplicationsEnabled(int32_t serial) override; ::ndk::ScopedAStatus changeIccPin2ForApp(int32_t serial, const std::string& oldPin2, const std::string& newPin2, @@ -102,6 +100,9 @@ class RadioSim : public RadioCompatBase, public aidl::android::hardware::radio:: int32_t serial, const ::aidl::android::hardware::radio::sim::PhonebookRecordInfo& recordInfo) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; }; diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioVoice.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioVoice.h index 0f1d5fda61..7bc998e176 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioVoice.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioVoice.h @@ -23,8 +23,6 @@ namespace android::hardware::radio::compat { class RadioVoice : public RadioCompatBase, public aidl::android::hardware::radio::voice::BnRadioVoice { - std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceResponse> respond(); - ::ndk::ScopedAStatus acceptCall(int32_t serial) override; ::ndk::ScopedAStatus cancelPendingUssd(int32_t serial) override; ::ndk::ScopedAStatus conference(int32_t serial) override; @@ -80,6 +78,9 @@ class RadioVoice : public RadioCompatBase, ::ndk::ScopedAStatus stopDtmf(int32_t serial) override; ::ndk::ScopedAStatus switchWaitingOrHoldingAndActive(int32_t serial) override; + protected: + std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceResponse> respond(); + public: using RadioCompatBase::RadioCompatBase; };