From: Tim Zimmermann Date: Sat, 16 Mar 2024 19:47:06 +0000 (+0100) Subject: aidl: ISehRadioNetworkIndication: Add missing function X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cca18c3474ed04c495bacf0c93df3093cd35f779;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung.git aidl: ISehRadioNetworkIndication: Add missing function * Without this all the transaction IDs after this function are shifted by one * When libril_sem tries to call vendorConfigurationChanged() which is the last function in the interface, previously the AIDL lib would not have any transaction matching it, causing it to call the very last function (getInterfaceVersion) which, due to different parameters, causes a segmentation fault Change-Id: Ic6e9b740313d96c0c645fc54a0804d348892718a --- diff --git a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/.hash b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/.hash index 4c11220..cdeadd1 100644 --- a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/.hash +++ b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/.hash @@ -1 +1 @@ -b6801a5cca21eab5f8034f5bec4c6a01ef856157 +0fac7647ce0de55319d9c5fa53bdf92cfdc1a5c2 diff --git a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl index a5669a1..807cf98 100644 --- a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl +++ b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/1/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl @@ -30,6 +30,7 @@ interface ISehRadioNetworkIndication { oneway void needTurnOnRadioIndication(int type); oneway void nrBearerAllocationChanged(int type, int status); oneway void nrIconTypeChanged(int type, int nrIconType); + oneway void nrNetworkTypeAdded(int type, int nrNetworkType); oneway void roamingNetworkScanIsRequested(int type, in byte[] scanData); oneway void signalLevelInfoChanged(int type, in vendor.samsung.hardware.radio.network.SehSignalBar signalBarInfo); oneway void vendorConfigurationChanged(int type, in vendor.samsung.hardware.radio.network.SehVendorConfiguration[] configurations); diff --git a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/current/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/current/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl index a5669a1..807cf98 100644 --- a/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/current/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl +++ b/interfaces/radio/network/aidl/aidl_api/vendor.samsung.hardware.radio.network/current/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl @@ -30,6 +30,7 @@ interface ISehRadioNetworkIndication { oneway void needTurnOnRadioIndication(int type); oneway void nrBearerAllocationChanged(int type, int status); oneway void nrIconTypeChanged(int type, int nrIconType); + oneway void nrNetworkTypeAdded(int type, int nrNetworkType); oneway void roamingNetworkScanIsRequested(int type, in byte[] scanData); oneway void signalLevelInfoChanged(int type, in vendor.samsung.hardware.radio.network.SehSignalBar signalBarInfo); oneway void vendorConfigurationChanged(int type, in vendor.samsung.hardware.radio.network.SehVendorConfiguration[] configurations); diff --git a/interfaces/radio/network/aidl/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl b/interfaces/radio/network/aidl/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl index 8125415..1c9ad66 100644 --- a/interfaces/radio/network/aidl/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl +++ b/interfaces/radio/network/aidl/vendor/samsung/hardware/radio/network/ISehRadioNetworkIndication.aidl @@ -19,6 +19,7 @@ interface ISehRadioNetworkIndication { oneway void needTurnOnRadioIndication(int type); oneway void nrBearerAllocationChanged(int type, int status); oneway void nrIconTypeChanged(int type, int nrIconType); + oneway void nrNetworkTypeAdded(int type, int nrNetworkType); oneway void roamingNetworkScanIsRequested(int type, in byte[] scanData); oneway void signalLevelInfoChanged(int type, in SehSignalBar signalBarInfo); oneway void vendorConfigurationChanged(int type, in SehVendorConfiguration[] configurations); diff --git a/ril/sehradiomanager/aidl/SehRadioNetworkIndication.cpp b/ril/sehradiomanager/aidl/SehRadioNetworkIndication.cpp index 62f1b30..9b76c41 100644 --- a/ril/sehradiomanager/aidl/SehRadioNetworkIndication.cpp +++ b/ril/sehradiomanager/aidl/SehRadioNetworkIndication.cpp @@ -88,6 +88,12 @@ ndk::ScopedAStatus SehRadioNetworkIndication::nrIconTypeChanged(int32_t type, in return ndk::ScopedAStatus::ok(); } +ndk::ScopedAStatus SehRadioNetworkIndication::nrNetworkTypeAdded(int32_t type, + int32_t nrNetworkType) { + l(__func__); + return ndk::ScopedAStatus::ok(); +} + ndk::ScopedAStatus SehRadioNetworkIndication::roamingNetworkScanIsRequested( int32_t type, const std::vector& scanData) { l(__func__); diff --git a/ril/sehradiomanager/aidl/SehRadioNetworkIndication.h b/ril/sehradiomanager/aidl/SehRadioNetworkIndication.h index 5140db9..e8d1eda 100644 --- a/ril/sehradiomanager/aidl/SehRadioNetworkIndication.h +++ b/ril/sehradiomanager/aidl/SehRadioNetworkIndication.h @@ -32,6 +32,7 @@ class SehRadioNetworkIndication : public BnSehRadioNetworkIndication { ndk::ScopedAStatus needTurnOnRadioIndication(int32_t type) override; ndk::ScopedAStatus nrBearerAllocationChanged(int32_t type, int32_t status) override; ndk::ScopedAStatus nrIconTypeChanged(int32_t type, int32_t nrIconType) override; + ndk::ScopedAStatus nrNetworkTypeAdded(int32_t type, int32_t nrNetworkType) override; ndk::ScopedAStatus roamingNetworkScanIsRequested(int32_t type, const std::vector& scanData) override; ndk::ScopedAStatus signalLevelInfoChanged(int32_t type,