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

Commit b1f70726 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix conversion errors in RILUtils" am: d23cda2e am: acfe01d3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2029625

Change-Id: Id5e6530d128ed2fa29664cb2108f21cac568e97a
parents 98c027fa acfe01d3

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

+11 −8
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ public class RILUtils { 
        android.hardware.radio.network.RadioAccessSpecifierBands bandsInHalFormat =

                new android.hardware.radio.network.RadioAccessSpecifierBands();

        rasInHalFormat.accessNetwork = convertToHalAccessNetworkAidl(ras.getRadioAccessNetwork());

        int[] bands = null;

        int[] bands;

        if (ras.getBands() != null) {

            bands = new int[ras.getBands().length];

            for (int i = 0; i < ras.getBands().length; i++) {
@@ -1364,29 +1364,32 @@ public class RILUtils { 
        }

        switch (ras.getRadioAccessNetwork()) {

            case AccessNetworkConstants.AccessNetworkType.GERAN:

                bandsInHalFormat.geranBands(bands);

                bandsInHalFormat.setGeranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.UTRAN:

                bandsInHalFormat.utranBands(bands);

                bandsInHalFormat.setUtranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.EUTRAN:

                bandsInHalFormat.eutranBands(bands);

                bandsInHalFormat.setEutranBands(bands);

                break;

            case AccessNetworkConstants.AccessNetworkType.NGRAN:

                bandsInHalFormat.ngranBands(bands);

                bandsInHalFormat.setNgranBands(bands);

                break;

            default:

                return null;

        }

        rasInHalFormat.bands = bandsInHalFormat;



        int[] channels;

        if (ras.getChannels() != null) {

            int[] channels = new int[ras.getChannels().length];

            channels = new int[ras.getChannels().length];

            for (int i = 0; i < ras.getChannels().length; i++) {

                channels[i] = ras.getChannels()[i];

            }

            rasInHalFormat.channels = channels;

        } else {

            channels = new int[0];

        }

        rasInHalFormat.channels = channels;



        return rasInHalFormat;

    }
@@ -2730,7 +2733,7 @@ public class RILUtils { 
            android.hardware.radio.network.CellIdentityGsm cid) {

        return new CellIdentityGsm(cid.lac, cid.cid, cid.arfcn,

                cid.bsic == (byte) 0xFF ? CellInfo.UNAVAILABLE : cid.bsic, cid.mcc, cid.mnc,

                "", "", new ArraySet<>());

                cid.operatorNames.alphaLong, cid.operatorNames.alphaShort, new ArraySet<>());

    }



    /**