Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[PhysicalChannelConfig] UL's frequency should not be same with DL's" into sc-dev am: 4afa9546f9 am: 33322518d2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15373617

Change-Id: I4be930fce6b8ebc58753b371dce99b582be03a7a
This commit is contained in:
Amruth Ramachandran
2021-07-27 14:18:29 +00:00
committed by Automerger Merge Worker
parent 9f90c4ce81 33322518d2
commit 5fa6815596
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
telephony/java/android/telephony/AccessNetworkUtils.java
View File

@@ -567,6 +567,10 @@ public class AccessNetworkUtils {
*/ */
public static int getFrequencyFromNrArfcn(int nrArfcn) { public static int getFrequencyFromNrArfcn(int nrArfcn) {
if (nrArfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
}
int globalKhz = 0; int globalKhz = 0;
int rangeOffset = 0; int rangeOffset = 0;
int arfcnOffset = 0; int arfcnOffset = 0;
@@ -632,6 +636,10 @@ public class AccessNetworkUtils {
*/ */
public static int getFrequencyFromUarfcn(int band, int uarfcn, boolean isUplink) { public static int getFrequencyFromUarfcn(int band, int uarfcn, boolean isUplink) {
if (uarfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
}
int offsetKhz = 0; int offsetKhz = 0;
for (UtranBandArfcnFrequency uarfcnFrequency : AccessNetworkConstants. for (UtranBandArfcnFrequency uarfcnFrequency : AccessNetworkConstants.
UtranBandArfcnFrequency.values()) { UtranBandArfcnFrequency.values()) {
@@ -702,6 +710,10 @@ public class AccessNetworkUtils {
*/ */
public static int getFrequencyFromArfcn(int band, int arfcn, boolean isUplink) { public static int getFrequencyFromArfcn(int band, int arfcn, boolean isUplink) {
if (arfcn == PhysicalChannelConfig.CHANNEL_NUMBER_UNKNOWN) {
return PhysicalChannelConfig.FREQUENCY_UNKNOWN;
}
int uplinkFrequencyFirst = 0; int uplinkFrequencyFirst = 0;
int arfcnOffset = 0; int arfcnOffset = 0;
int downlinkOffset = 0; int downlinkOffset = 0;

3
telephony/java/android/telephony/PhysicalChannelConfig.java
View File

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