Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" (7ffe1efa) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/AccessNetworkConstants.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -637,18 +637,18 @@ public final class AccessNetworkConstants {
		this.band = band;
		this.downlinkLowKhz = downlinkLowKhz;
		this.downlinkOffset = downlinkOffset;
		this.downlinkRange = downlinkRange;
		this.uplinkLowKhz = uplinkLowKhz;
		this.uplinkOffset = uplinkOffset;
		this.downlinkRange = downlinkRange;
		this.uplinkRange = uplinkRange;
		}

		int band;
		int downlinkLowKhz;
		int downlinkOffset;
		int downlinkRange;
		int uplinkLowKhz;
		int uplinkOffset;
		int downlinkRange;
		int uplinkRange;
		}

+8 −5

Original line number	Diff line number	Diff line
		@@ -598,7 +598,8 @@ public class AccessNetworkUtils {
		: earfcnFrequency.downlinkOffset;
		break;
		} else {
		Log.e(TAG, "Band and the range of EARFCN are not consistent.");
		Rlog.w(TAG,"Band and the range of EARFCN are not consistent: band = " + band
		+ " ,earfcn = " + earfcn + " ,isUplink = " + isUplink);
		return INVALID_FREQUENCY;
		}
		}
		@@ -640,7 +641,8 @@ public class AccessNetworkUtils {
		: uarfcnFrequency.downlinkOffset;
		break;
		} else {
		Log.e(TAG, "Band and the range of UARFCN are not consistent.");
		Rlog.w(TAG,"Band and the range of UARFCN are not consistent: band = " + band
		+ " ,uarfcn = " + uarfcn + " ,isUplink = " + isUplink);
		return INVALID_FREQUENCY;
		}
		}
		@@ -716,7 +718,8 @@ public class AccessNetworkUtils {
		arfcnOffset);
		break;
		} else {
		Log.e(TAG, "Band and the range of ARFCN are not consistent.");
		Rlog.w(TAG,"Band and the range of ARFCN are not consistent: band = " + band
		+ " ,arfcn = " + arfcn + " ,isUplink = " + isUplink);
		return INVALID_FREQUENCY;
		}
		}