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

Commit b9e26453 authored by Sarah Chin's avatar Sarah Chin
Browse files

Update IRadio module AIDL versions

Convert IRadioService#getInterfaceVersion into the corresponding
HalVersion for each service/module.

Test: atest RILTest, RILE2eTests
Bug: 267940733
Change-Id: I4c7c4bf5f2def3b148d85fb1367a5b1d6ba004bb
parent 8d36657a
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -7216,6 +7216,19 @@ public class RIL extends BaseCommands implements CommandsInterface {
        return halVersion;
    }

    /**
     * Get the HAL version corresponding to the interface version of a IRadioService module.
     * @param interfaceVersion The interface version, from IRadioService#getInterfaceVersion().
     * @return The corresponding HalVersion.
     */
    public static HalVersion getServiceHalVersion(int interfaceVersion) {
        switch (interfaceVersion) {
            case 1: return RADIO_HAL_VERSION_2_0;
            case 2: return RADIO_HAL_VERSION_2_1;
            default: return RADIO_HAL_VERSION_UNKNOWN;
        }
    }

    private static String serviceToString(@HalService int service) {
        switch (service) {
            case HAL_SERVICE_RADIO:
+5 −16
Original line number Diff line number Diff line
@@ -49,26 +49,15 @@ public class RadioDataProxy extends RadioServiceProxy {
     * @return updated HAL version
     */
    public HalVersion setAidl(HalVersion halVersion, android.hardware.radio.data.IRadioData data) {
        mHalVersion = halVersion;
        mDataProxy = data;
        mIsAidl = true;

        HalVersion version = halVersion;
        try {
            HalVersion newHalVersion;
            int version = data.getInterfaceVersion();
            switch(version) {
                default:
                    newHalVersion = RIL.RADIO_HAL_VERSION_2_0;
                    break;
            }
            Rlog.d(TAG, "AIDL version=" + version + ", halVersion=" + newHalVersion);

            if (mHalVersion.less(newHalVersion)) {
                mHalVersion = newHalVersion;
            }
            version = RIL.getServiceHalVersion(data.getInterfaceVersion());
        } catch (RemoteException e) {
            Rlog.e(TAG, "setAidl: " + e);
        }
        mHalVersion = version;
        mDataProxy = data;
        mIsAidl = true;

        Rlog.d(TAG, "AIDL initialized mHalVersion=" + mHalVersion);
        return mHalVersion;
+5 −16
Original line number Diff line number Diff line
@@ -35,26 +35,15 @@ public class RadioImsProxy extends RadioServiceProxy {
     * @return updated HAL version.
     */
    public HalVersion setAidl(HalVersion halVersion, android.hardware.radio.ims.IRadioIms ims) {
        mHalVersion = halVersion;
        mImsProxy = ims;
        mIsAidl = true;

        HalVersion version = halVersion;
        try {
            HalVersion newHalVersion;
            int version = ims.getInterfaceVersion();
            switch(version) {
                default:
                    newHalVersion = RIL.RADIO_HAL_VERSION_2_0;
                    break;
            }
            Rlog.d(TAG, "AIDL version=" + version + ", halVersion=" + newHalVersion);

            if (mHalVersion.less(newHalVersion)) {
                mHalVersion = newHalVersion;
            }
            version = RIL.getServiceHalVersion(ims.getInterfaceVersion());
        } catch (RemoteException e) {
            Rlog.e(TAG, "setAidl: " + e);
        }
        mHalVersion = version;
        mImsProxy = ims;
        mIsAidl = true;

        Rlog.d(TAG, "AIDL initialized mHalVersion=" + mHalVersion);
        return mHalVersion;
+5 −16
Original line number Diff line number Diff line
@@ -41,26 +41,15 @@ public class RadioMessagingProxy extends RadioServiceProxy {
     */
    public HalVersion setAidl(HalVersion halVersion,
            android.hardware.radio.messaging.IRadioMessaging messaging) {
        mHalVersion = halVersion;
        mMessagingProxy = messaging;
        mIsAidl = true;

        HalVersion version = halVersion;
        try {
            HalVersion newHalVersion;
            int version = messaging.getInterfaceVersion();
            switch(version) {
                default:
                    newHalVersion = RIL.RADIO_HAL_VERSION_2_0;
                    break;
            }
            Rlog.d(TAG, "AIDL version=" + version + ", halVersion=" + newHalVersion);

            if (mHalVersion.less(newHalVersion)) {
                mHalVersion = newHalVersion;
            }
            version = RIL.getServiceHalVersion(messaging.getInterfaceVersion());
        } catch (RemoteException e) {
            Rlog.e(TAG, "setAidl: " + e);
        }
        mHalVersion = version;
        mMessagingProxy = messaging;
        mIsAidl = true;

        Rlog.d(TAG, "AIDL initialized mHalVersion=" + mHalVersion);
        return mHalVersion;
+5 −16
Original line number Diff line number Diff line
@@ -36,26 +36,15 @@ public class RadioModemProxy extends RadioServiceProxy {
     */
    public HalVersion setAidl(HalVersion halVersion,
            android.hardware.radio.modem.IRadioModem modem) {
        mHalVersion = halVersion;
        mModemProxy = modem;
        mIsAidl = true;

        HalVersion version = halVersion;
        try {
            HalVersion newHalVersion;
            int version = modem.getInterfaceVersion();
            switch(version) {
                default:
                    newHalVersion = RIL.RADIO_HAL_VERSION_2_0;
                    break;
            }
            Rlog.d(TAG, "AIDL version=" + version + ", halVersion=" + newHalVersion);

            if (mHalVersion.less(newHalVersion)) {
                mHalVersion = newHalVersion;
            }
            version = RIL.getServiceHalVersion(modem.getInterfaceVersion());
        } catch (RemoteException e) {
            Rlog.e(TAG, "setAidl: " + e);
        }
        mHalVersion = version;
        mModemProxy = modem;
        mIsAidl = true;

        Rlog.d(TAG, "AIDL initialized mHalVersion=" + mHalVersion);
        return mHalVersion;
Loading