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

Commit 1a7f018d authored by Sangyun Yun's avatar Sangyun Yun Committed by Automerger Merge Worker
Browse files

Merge "Not to report anomaly for the unknown band of PhysicalChannelConfig"... 

Merge "Not to report anomaly for the unknown band of PhysicalChannelConfig" into udc-dev am: 942b4e7d

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



Change-Id: I62ac75e4d915ef5e1d65a26a5095e9e487e4b22c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 167969b0 942b4e7d

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

+11 −4
Original line number Diff line number Diff line
@@ -149,22 +149,29 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 
        try {

            for (android.hardware.radio.network.PhysicalChannelConfig config : configs) {

                PhysicalChannelConfig.Builder builder = new PhysicalChannelConfig.Builder();

                int band = PhysicalChannelConfig.BAND_UNKNOWN;

                switch (config.band.getTag()) {

                    case android.hardware.radio.network.PhysicalChannelConfigBand.geranBand:

                        builder.setBand(config.band.getGeranBand());

                        band = config.band.getGeranBand();

                        break;

                    case android.hardware.radio.network.PhysicalChannelConfigBand.utranBand:

                        builder.setBand(config.band.getUtranBand());

                        band = config.band.getUtranBand();

                        break;

                    case android.hardware.radio.network.PhysicalChannelConfigBand.eutranBand:

                        builder.setBand(config.band.getEutranBand());

                        band = config.band.getEutranBand();

                        break;

                    case android.hardware.radio.network.PhysicalChannelConfigBand.ngranBand:

                        builder.setBand(config.band.getNgranBand());

                        band = config.band.getNgranBand();

                        break;

                    default:

                        mRil.riljLoge("Unsupported band type " + config.band.getTag());

                }

                if (band == PhysicalChannelConfig.BAND_UNKNOWN) {

                    mRil.riljLoge("Unsupported unknown band.");

                    return;

                } else {

                    builder.setBand(band);

                }

                response.add(builder.setCellConnectionStatus(

                        RILUtils.convertHalCellConnectionStatus(config.status))

                        .setDownlinkChannelNumber(config.downlinkChannelNumber)

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

+11 −4
Original line number Diff line number Diff line
@@ -1225,22 +1225,29 @@ public class RadioIndication extends IRadioIndication.Stub { 
                    android.hardware.radio.V1_6.PhysicalChannelConfig config =

                            (android.hardware.radio.V1_6.PhysicalChannelConfig) obj;

                    PhysicalChannelConfig.Builder builder = new PhysicalChannelConfig.Builder();

                    int band = PhysicalChannelConfig.BAND_UNKNOWN;

                    switch (config.band.getDiscriminator()) {

                        case Band.hidl_discriminator.geranBand:

                            builder.setBand(config.band.geranBand());

                            band = config.band.geranBand();

                            break;

                        case Band.hidl_discriminator.utranBand:

                            builder.setBand(config.band.utranBand());

                            band = config.band.utranBand();

                            break;

                        case Band.hidl_discriminator.eutranBand:

                            builder.setBand(config.band.eutranBand());

                            band = config.band.eutranBand();

                            break;

                        case Band.hidl_discriminator.ngranBand:

                            builder.setBand(config.band.ngranBand());

                            band = config.band.ngranBand();

                            break;

                        default:

                            mRil.riljLoge("Unsupported band " + config.band.getDiscriminator());

                    }

                    if (band == PhysicalChannelConfig.BAND_UNKNOWN) {

                        mRil.riljLoge("Unsupported unknown band.");

                        return;

                    } else {

                        builder.setBand(band);

                    }

                    response.add(builder.setCellConnectionStatus(

                            RILUtils.convertHalCellConnectionStatus(config.status))

                            .setDownlinkChannelNumber(config.downlinkChannelNumber)