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

Commit 60e50d05 authored by Sarah Chin's avatar Sarah Chin
Browse files

IRadio AIDL conversions don't allow null for arrays 

Test: build
Bug: 212328322
Change-Id: I447e919d612160337ae3d5f82da7b3e2922216a5
parent 58981918

src/java/com/android/internal/telephony/RILUtils.java

+6 −5
Original line number Diff line number Diff line
@@ -966,8 +966,7 @@ public class RILUtils { 
        dpi.persistent = dp.isPersistent();

        dpi.preferred = dp.isPreferred();

        dpi.alwaysOn = dp.getApnSetting().isAlwaysOn();

        dpi.trafficDescriptor = RILUtils.convertToHalTrafficDescriptorAidl(

                dp.getTrafficDescriptor());

        dpi.trafficDescriptor = convertToHalTrafficDescriptorAidl(dp.getTrafficDescriptor());



        // profile id is only meaningful when it's persistent on the modem.

        dpi.profileId = (dpi.persistent) ? dp.getProfileId()
@@ -1179,7 +1178,7 @@ public class RILUtils { 
    public static android.hardware.radio.data.LinkAddress[] convertToHalLinkProperties(

            LinkProperties linkProperties) {

        if (linkProperties == null) {

            return null;

            return new android.hardware.radio.data.LinkAddress[0];

        }

        android.hardware.radio.data.LinkAddress[] addresses =

                new android.hardware.radio.data.LinkAddress[
@@ -1358,6 +1357,8 @@ public class RILUtils { 
            for (int i = 0; i < ras.getBands().length; i++) {

                bands[i] = ras.getBands()[i];

            }

        } else {

            bands = new int[0];

        }

        switch (ras.getRadioAccessNetwork()) {

            case AccessNetworkConstants.AccessNetworkType.GERAN:
@@ -2520,8 +2521,8 @@ public class RILUtils { 
    }



    /**

     * Convert a CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal to CellInfo

     * @param cellInfo CellInfo defined in radio/1.0, 1.2, 1.4, 1.5, 1.6/types.hal

     * Convert a CellInfo defined in CellInfo.aidl to CellInfo

     * @param cellInfo CellInfo defined in CellInfo.aidl

     * @param nanotime time the CellInfo was created

     * @return The converted CellInfo

     */

src/java/com/android/internal/telephony/RadioDataProxy.java

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ public class RadioDataProxy extends RadioServiceProxy { 
                dnses.add(linkProperties.getDnsServers().get(i).getHostAddress());

                dnsesArr[i] = linkProperties.getDnsServers().get(i).getHostAddress();

            }

        } else {

            dnsesArr = new String[0];

        }

        if (isAidl()) {

            // Create a new DataProfile to set the TrafficDescriptor

src/java/com/android/internal/telephony/RadioVoiceProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class RadioVoiceProxy extends RadioServiceProxy { 
                    emergencyNumberInfo.getEmergencyServiceCategoryBitmaskInternalDial(),

                    emergencyNumberInfo.getEmergencyUrns() != null

                            ? emergencyNumberInfo.getEmergencyUrns().stream().toArray(String[]::new)

                            : null,

                            : new String[0],

                    emergencyNumberInfo.getEmergencyCallRouting(),

                    hasKnownUserIntentEmergency,

                    emergencyNumberInfo.getEmergencyNumberSourceBitmask()