Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" (a6f81885) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/AccessNetworkUtils.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -567,6 +567,10 @@ public class AccessNetworkUtils {
		*/
		public static int getFrequencyFromNrArfcn(int nrArfcn) {

		if (nrArfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
		return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
		}

		int globalKhz = 0;
		int rangeOffset = 0;
		int arfcnOffset = 0;
		@@ -632,6 +636,10 @@ public class AccessNetworkUtils {
		*/
		public static int getFrequencyFromUarfcn(int band, int uarfcn, boolean isUplink) {

		if (uarfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
		return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
		}

		int offsetKhz = 0;
		for (UtranBandArfcnFrequency uarfcnFrequency : AccessNetworkConstants.
		UtranBandArfcnFrequency.values()) {
		@@ -702,6 +710,10 @@ public class AccessNetworkUtils {
		*/
		public static int getFrequencyFromArfcn(int band, int arfcn, boolean isUplink) {

		if (arfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
		return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
		}

		int uplinkFrequencyFirst = 0;
		int arfcnOffset = 0;
		int downlinkOffset = 0;

+2 −1

Original line number	Diff line number	Diff line
		@@ -337,7 +337,8 @@ public final class PhysicalChannelConfig implements Parcelable {
		private void setUplinkFrequency() {
		switch (mNetworkType){
		case TelephonyManager.NETWORK_TYPE_NR:
		mUplinkFrequency = mDownlinkFrequency;
		mUplinkFrequency = AccessNetworkUtils.getFrequencyFromNrArfcn(
		mUplinkChannelNumber);
		break;
		case TelephonyManager.NETWORK_TYPE_LTE:
		mUplinkFrequency = AccessNetworkUtils.getFrequencyFromEarfcn(