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

Commit 31f6fab3 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Use most recent available HAL methods. 

Bug: 207695009
Test: Build with ag/16322062 and a handful of patches from b/207695009,
      try to use telephony stack
Change-Id: I7db1747550493a634290a968e3f5bbada66f322f
parent 6902a757

radio/aidl/compat/libradiocompat/data/RadioData.cpp

+5 −1
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ ScopedAStatus RadioData::deactivateDataCall(int32_t serial, int32_t cid, 


ScopedAStatus RadioData::getDataCallList(int32_t serial) {

    LOG_CALL << serial;

    if (mHal1_6) {

        mHal1_6->getDataCallList_1_6(serial);

    } else {

        mHal1_5->getDataCallList(serial);

    }

    return ok();

}

radio/aidl/compat/libradiocompat/messaging/RadioMessaging.cpp

+20 −4
Original line number Diff line number Diff line
@@ -104,13 +104,21 @@ ScopedAStatus RadioMessaging::responseAcknowledgement() { 


ScopedAStatus RadioMessaging::sendCdmaSms(int32_t serial, const aidl::CdmaSmsMessage& sms) {

    LOG_CALL << serial;

    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;

    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;

    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;

    if (mHal1_6) {

        mHal1_6->sendSmsExpectMore_1_6(serial, toHidl(msg));

    } else {

        mHal1_5->sendSMSExpectMore(serial, toHidl(msg));

    }

    return ok();

}

radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp

+23 −7
Original line number Diff line number Diff line
@@ -73,13 +73,21 @@ ScopedAStatus RadioNetwork::getCdmaRoamingPreference(int32_t serial) { 


ScopedAStatus RadioNetwork::getCellInfoList(int32_t serial) {

    LOG_CALL << 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();

}

radio/aidl/compat/libradiocompat/sim/RadioSim.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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();

}

radio/aidl/compat/libradiocompat/voice/RadioVoice.cpp

+16 −6
Original line number Diff line number Diff line
@@ -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;

    if (mHal1_6) {

        mHal1_6->getCurrentCalls_1_6(serial);

    } else {

        mHal1_5->getCurrentCalls(serial);

    }

    return ok();

}