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

Commit 5d8dc1e0 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[PhysicalChannelConfig] Add more useful logs when calculate actual frequency" am: 7ffe1efa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671793

Change-Id: I2447707c8ece48db7448453c828bd56ecaabae78
parents 774da343 7ffe1efa

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;

    }

telephony/java/android/telephony/AccessNetworkUtils.java

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

                }

            }