Merge "Expose response methods for services using compat library"

This commit is contained in:
TreeHugger Robot
2022-02-07 21:43:10 +00:00
committed by Android (Google) Code Review
7 changed files with 21 additions and 14 deletions

View File

@@ -39,8 +39,6 @@ class RadioConfig : public aidl::android::hardware::radio::config::BnRadioConfig
const sp<RadioConfigResponse> mRadioConfigResponse;
const sp<RadioConfigIndication> 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<aidl::android::hardware::radio::config::SlotPortMapping>& slotMap)
override;
protected:
std::shared_ptr<::aidl::android::hardware::radio::config::IRadioConfigResponse> respond();
public:
/**
* Constructs AIDL IRadioConfig instance wrapping existing HIDL IRadioConfig instance.

View File

@@ -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;
};

View File

@@ -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;
};

View File

@@ -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;
};

View File

@@ -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;
};

View File

@@ -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;
};

View File

@@ -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;
};