Merge "Not to report anomaly for the unknown band of PhysicalChannelConfig" into udc-dev (942b4e7d) · Commits · e / os / android_frameworks_opt_telephony

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)

+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)