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

Commit 80f07414 authored by arunvoddu's avatar arunvoddu
Browse files

Indication API for IMEI mapping change from radio 

Bug: 294127356
Test: Built successfully
Change-Id: I8c95e2132bf70ec5fcae7a4c7f447e329bf3843d
parent 8e411d70

radio/aidl/aidl_api/android.hardware.radio.modem/current/android/hardware/radio/modem/IRadioModemIndication.aidl

+1 −0
Original line number Diff line number Diff line
@@ -40,4 +40,5 @@ interface IRadioModemIndication { 
  oneway void radioCapabilityIndication(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.RadioCapability rc);

  oneway void radioStateChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.RadioState radioState);

  oneway void rilConnected(in android.hardware.radio.RadioIndicationType type);

  oneway void onImeiMappingChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.modem.ImeiInfo imeiInfo);

}

radio/aidl/android/hardware/radio/modem/IRadioModemIndication.aidl

+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.hardware.radio.RadioIndicationType; 
import android.hardware.radio.modem.HardwareConfig;

import android.hardware.radio.modem.RadioCapability;

import android.hardware.radio.modem.RadioState;

import android.hardware.radio.modem.ImeiInfo;



/**

 * Interface declaring unsolicited radio indications for modem APIs.
@@ -76,4 +77,12 @@ oneway interface IRadioModemIndication { 
     * @param type Type of radio indication

     */

    void rilConnected(in RadioIndicationType type);



    /**

     * Indicates when there is a change in the IMEI mapping.

     *

     * @param type Type of radio indication

     * @param imeiInfo IMEI information

     */

     void onImeiMappingChanged(in RadioIndicationType type, in ImeiInfo imeiInfo);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <aidl/android/hardware/radio/sim/IRadioSimIndication.h>

#include <aidl/android/hardware/radio/voice/IRadioVoiceIndication.h>

#include <android/hardware/radio/1.6/IRadioIndication.h>

#include <aidl/android/hardware/radio/modem/ImeiInfo.h>



namespace android::hardware::radio::compat {
@@ -208,7 +209,8 @@ class RadioIndication : public V1_6::IRadioIndication { 
    Return<void> simPhonebookRecordsReceived(

            V1_0::RadioIndicationType type, V1_6::PbReceivedStatus status,

            const hidl_vec<V1_6::PhonebookRecordInfo>& records) override;



    Return<void> onImeiMappingChanged(V1_0::RadioIndicationType type,

                                      ::aidl::android::hardware::radio::modem::ImeiInfo config);

  public:

    RadioIndication(std::shared_ptr<DriverContext> context);

radio/aidl/compat/libradiocompat/modem/RadioIndication-modem.cpp

+7 −0
Original line number Diff line number Diff line
@@ -68,4 +68,11 @@ Return<void> RadioIndication::rilConnected(V1_0::RadioIndicationType type) { 
    return {};

}



Return<void> RadioIndication::onImeiMappingChanged(V1_0::RadioIndicationType type,

                                    ::aidl::android::hardware::radio::modem::ImeiInfo imeiInfo) {

    LOG_CALL << type;

    modemCb()->onImeiMappingChanged(toAidl(type), imeiInfo);

    return {};

}



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

radio/aidl/vts/radio_modem_indication.cpp

+5 −0
Original line number Diff line number Diff line
@@ -41,3 +41,8 @@ ndk::ScopedAStatus RadioModemIndication::radioStateChanged(RadioIndicationType / 
ndk::ScopedAStatus RadioModemIndication::rilConnected(RadioIndicationType /*type*/) {

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus RadioModemIndication::onImeiMappingChanged(RadioIndicationType /*type*/,

     const ::aidl::android::hardware::radio::modem::ImeiInfo& /*imeiInfo*/) {

    return ndk::ScopedAStatus::ok();

}