Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use most recent available HAL methods.

Browse Source 
Bug: 207695009
Test: Build with ag/16322062 and a handful of patches from b/207695009,
      try to use telephony stack
Change-Id: I7db1747550493a634290a968e3f5bbada66f322f
Merged-In: I7db1747550493a634290a968e3f5bbada66f322f
This commit is contained in:
Tomasz Wasilczyk
2021-12-15 16:15:45 -08:00
parent 60638572b2
commit 571542b4be
5 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
radio/aidl/compat/libradiocompat/data/RadioData.cpp
View File

@@ -64,7 +64,11 @@ ScopedAStatus RadioData::deactivateDataCall(int32_t serial, int32_t cid,
ScopedAStatus RadioData::getDataCallList(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getDataCallList(serial);
if (mHal1_6) {
mHal1_6->getDataCallList_1_6(serial);
} else {
mHal1_5->getDataCallList(serial);
}
return ok();
}

24
radio/aidl/compat/libradiocompat/messaging/RadioMessaging.cpp
View File

@@ -104,13 +104,21 @@ ScopedAStatus RadioMessaging::responseAcknowledgement() {
ScopedAStatus RadioMessaging::sendCdmaSms(int32_t serial, const aidl::CdmaSmsMessage& sms) {
LOG_CALL << serial;
mHal1_5->sendCdmaSms(serial, toHidl(sms));
if (mHal1_6) {
mHal1_6->sendCdmaSms_1_6(serial, toHidl(sms));
} else {
mHal1_5->sendCdmaSms(serial, toHidl(sms));
}
return ok();
}
ScopedAStatus RadioMessaging::sendCdmaSmsExpectMore(int32_t serial, const aidl::CdmaSmsMessage& m) {
LOG_CALL << serial;
mHal1_5->sendCdmaSmsExpectMore(serial, toHidl(m));
if (mHal1_6) {
mHal1_6->sendCdmaSmsExpectMore_1_6(serial, toHidl(m));
} else {
mHal1_5->sendCdmaSmsExpectMore(serial, toHidl(m));
}
return ok();
}
@@ -122,13 +130,21 @@ ScopedAStatus RadioMessaging::sendImsSms(int32_t serial, const aidl::ImsSmsMessa
ScopedAStatus RadioMessaging::sendSms(int32_t serial, const aidl::GsmSmsMessage& message) {
LOG_CALL << serial;
mHal1_5->sendSms(serial, toHidl(message));
if (mHal1_6) {
mHal1_6->sendSms_1_6(serial, toHidl(message));
} else {
mHal1_5->sendSms(serial, toHidl(message));
}
return ok();
}
ScopedAStatus RadioMessaging::sendSmsExpectMore(int32_t serial, const aidl::GsmSmsMessage& msg) {
LOG_CALL << serial;
mHal1_5->sendSMSExpectMore(serial, toHidl(msg));
if (mHal1_6) {
mHal1_6->sendSmsExpectMore_1_6(serial, toHidl(msg));
} else {
mHal1_5->sendSMSExpectMore(serial, toHidl(msg));
}
return ok();
}

30
radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
View File

@@ -73,13 +73,21 @@ ScopedAStatus RadioNetwork::getCdmaRoamingPreference(int32_t serial) {
ScopedAStatus RadioNetwork::getCellInfoList(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getCellInfoList(serial);
if (mHal1_6) {
mHal1_6->getCellInfoList_1_6(serial);
} else {
mHal1_5->getCellInfoList(serial);
}
return ok();
}
ScopedAStatus RadioNetwork::getDataRegistrationState(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getDataRegistrationState(serial);
if (mHal1_6) {
mHal1_6->getDataRegistrationState_1_6(serial);
} else {
mHal1_5->getDataRegistrationState_1_5(serial);
}
return ok();
}
@@ -103,7 +111,11 @@ ScopedAStatus RadioNetwork::getOperator(int32_t serial) {
ScopedAStatus RadioNetwork::getSignalStrength(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getSignalStrength(serial);
if (mHal1_6) {
mHal1_6->getSignalStrength_1_6(serial);
} else {
mHal1_5->getSignalStrength_1_4(serial);
}
return ok();
}
@@ -125,7 +137,11 @@ ScopedAStatus RadioNetwork::getVoiceRadioTechnology(int32_t serial) {
ScopedAStatus RadioNetwork::getVoiceRegistrationState(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getVoiceRegistrationState(serial);
if (mHal1_6) {
mHal1_6->getVoiceRegistrationState_1_6(serial);
} else {
mHal1_5->getVoiceRegistrationState_1_5(serial);
}
return ok();
}
@@ -183,7 +199,7 @@ ScopedAStatus RadioNetwork::setCellInfoListRate(int32_t serial, int32_t rate) {
ScopedAStatus RadioNetwork::setIndicationFilter(int32_t serial, aidl::IndicationFilter indFilter) {
LOG_CALL << serial;
mHal1_5->setIndicationFilter(serial, toHidlBitfield<V1_0::IndicationFilter>(indFilter));
mHal1_5->setIndicationFilter_1_5(serial, toHidlBitfield<V1_5::IndicationFilter>(indFilter));
return ok();
}
@@ -192,9 +208,9 @@ ScopedAStatus RadioNetwork::setLinkCapacityReportingCriteria( //
const std::vector<int32_t>& thrDownlinkKbps, const std::vector<int32_t>& thrUplinkKbps,
AccessNetwork accessNetwork) {
LOG_CALL << serial;
mHal1_5->setLinkCapacityReportingCriteria( //
mHal1_5->setLinkCapacityReportingCriteria_1_5( //
serial, hysteresisMs, hysteresisDlKbps, hysteresisUlKbps, thrDownlinkKbps,
thrUplinkKbps, V1_2::AccessNetwork(accessNetwork));
thrUplinkKbps, V1_5::AccessNetwork(accessNetwork));
return ok();
}

2
radio/aidl/compat/libradiocompat/sim/RadioSim.cpp
View File

@@ -62,7 +62,7 @@ ScopedAStatus RadioSim::enableUiccApplications(int32_t serial, bool enable) {
ScopedAStatus RadioSim::getAllowedCarriers(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getAllowedCarriers(serial);
mHal1_5->getAllowedCarriers_1_4(serial);
return ok();
}

22
radio/aidl/compat/libradiocompat/voice/RadioVoice.cpp
View File

@@ -53,13 +53,19 @@ ScopedAStatus RadioVoice::dial(int32_t serial, const aidl::Dial& dialInfo) {
}
ScopedAStatus RadioVoice::emergencyDial( //
int32_t serial, const aidl::Dial& dialInfo, aidl::EmergencyServiceCategory categories,
int32_t serial, const aidl::Dial& info, aidl::EmergencyServiceCategory categories,
const std::vector<std::string>& urns, aidl::EmergencyCallRouting routing,
bool hasKnownUserIntentEmerg, bool isTesting) {
bool knownUserIntentEmerg, bool isTesting) {
LOG_CALL << serial;
mHal1_5->emergencyDial(serial, toHidl(dialInfo),
toHidlBitfield<V1_4::EmergencyServiceCategory>(categories), toHidl(urns),
V1_4::EmergencyCallRouting(routing), hasKnownUserIntentEmerg, isTesting);
if (mHal1_6) {
mHal1_6->emergencyDial_1_6( //
serial, toHidl(info), toHidlBitfield<V1_4::EmergencyServiceCategory>(categories),
toHidl(urns), V1_4::EmergencyCallRouting(routing), knownUserIntentEmerg, isTesting);
} else {
mHal1_5->emergencyDial( //
serial, toHidl(info), toHidlBitfield<V1_4::EmergencyServiceCategory>(categories),
toHidl(urns), V1_4::EmergencyCallRouting(routing), knownUserIntentEmerg, isTesting);
}
return ok();
}
@@ -102,7 +108,11 @@ ScopedAStatus RadioVoice::getClir(int32_t serial) {
ScopedAStatus RadioVoice::getCurrentCalls(int32_t serial) {
LOG_CALL << serial;
mHal1_5->getCurrentCalls(serial);
if (mHal1_6) {
mHal1_6->getCurrentCalls_1_6(serial);
} else {
mHal1_5->getCurrentCalls(serial);
}
return ok();
}