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

Commit 60d28d2c authored by Hunsuk Choi's avatar Hunsuk Choi
Browse files

Upgrade the version of IRadioNetwork to V2 

Bug: 243344927
Bug: 232285403
Test: build and flash
Change-Id: I4cc204c9237f017126a52cb12da5891671f248d6
parent 36117a15

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.radio.network</name>

        <version>1</version>

        <version>2</version>

        <interface>

            <name>IRadioNetwork</name>

            <instance>slot1</instance>

radio/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ aidl_interface { 
    host_supported: true,

    srcs: ["android/hardware/radio/network/*.aidl"],

    stability: "vintf",

    imports: ["android.hardware.radio"],

    imports: ["android.hardware.radio-V1"],

    backend: {

        cpp: {

            enabled: true,

radio/aidl/compat/libradiocompat/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ cc_library { 
        "android.hardware.radio.data-V1-ndk",

        "android.hardware.radio.messaging-V1-ndk",

        "android.hardware.radio.modem-V1-ndk",

        "android.hardware.radio.network-V1-ndk",

        "android.hardware.radio.network-V2-ndk",

        "android.hardware.radio.sim-V1-ndk",

        "android.hardware.radio.voice-V1-ndk",

        "android.hardware.radio@1.0",

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

+10 −0
Original line number Diff line number Diff line
@@ -90,6 +90,16 @@ class RadioNetwork : public RadioCompatBase, 
            ::aidl::android::hardware::radio::network::UsageSetting usageSetting) override;

    ::ndk::ScopedAStatus getUsageSetting(int32_t serial) override;



    ::ndk::ScopedAStatus setEmergencyMode(

            int32_t serial,

            const ::aidl::android::hardware::radio::network::EmergencyMode emergencyMode) override;

    ::ndk::ScopedAStatus triggerEmergencyNetworkScan(

            int32_t serial,

            const ::aidl::android::hardware::radio::network::EmergencyNetworkScanTrigger&

                    scanTrigger) override;

    ::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial) override;

    ::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;



  protected:

    std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond();

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

+29 −0
Original line number Diff line number Diff line
@@ -311,4 +311,33 @@ ScopedAStatus RadioNetwork::getUsageSetting(int32_t serial) { 
    return ok();

}



ScopedAStatus RadioNetwork::setEmergencyMode(int32_t serial, aidl::EmergencyMode) {

    LOG_CALL << serial;

    LOG(ERROR) << " setEmergencyMode is unsupported by HIDL HALs";

    respond()->setEmergencyModeResponse(notSupported(serial), {});

    return ok();

}



ScopedAStatus RadioNetwork::triggerEmergencyNetworkScan(int32_t serial,

        const aidl::EmergencyNetworkScanTrigger&) {

    LOG_CALL << serial;

    LOG(ERROR) << " triggerEmergencyNetworkScan is unsupported by HIDL HALs";

    respond()->triggerEmergencyNetworkScanResponse(notSupported(serial));

    return ok();

}



ScopedAStatus RadioNetwork::cancelEmergencyNetworkScan(int32_t serial) {

    LOG_CALL << serial;

    LOG(ERROR) << " cancelEmergencyNetworkScan is unsupported by HIDL HALs";

    respond()->cancelEmergencyNetworkScanResponse(notSupported(serial));

    return ok();

}



ScopedAStatus RadioNetwork::exitEmergencyMode(int32_t serial) {

    LOG_CALL << serial;

    LOG(ERROR) << " exitEmergencyMode is unsupported by HIDL HALs";

    respond()->exitEmergencyModeResponse(notSupported(serial));

    return ok();

}



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