commit b7f5e3782c62d9876e4c458d9d8cca14a3913fa1
author Pengquan Meng <mpq@google.com> Wed Mar 06 14:32:03 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 14:32:03 2019 -0800
tree 038e9c2db20f05c51fe0a2e52f7ba0e1d6a8a381
parent 7c59ddb0b8509768ffb526d57ec6c2b1947335d2
parent 8273d66ebc1767bc75531c53ced129eeccf4aa4c

Merge "[API Feedback] Rename getChannelNumber to getNrarfcn"
am: 8273d66ebc

Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 95b6214..5e09106 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42336,10 +42336,10 @@
   }
 
   public final class CellIdentityNr extends android.telephony.CellIdentity {
-    method public int getChannelNumber();
     method public String getMccString();
     method public String getMncString();
     method public long getNci();
+    method public int getNrarfcn();
     method public int getPci();
     method public int getTac();
     method public void writeToParcel(android.os.Parcel, int);

telephony/java/android/telephony/CellIdentityNr.java

diff --git a/telephony/java/android/telephony/CellIdentityNr.java b/telephony/java/android/telephony/CellIdentityNr.java
index 19bc0ce..b94ca9b 100644
--- a/telephony/java/android/telephony/CellIdentityNr.java
+++ b/telephony/java/android/telephony/CellIdentityNr.java
@@ -89,11 +89,14 @@
     }
 
     /**
-     * Get the Absolute Radio Frequency Channel Number.
+     * Get the New Radio Absolute Radio Frequency Channel Number.
+     *
+     * Reference: 3GPP TS 38.101-1 section 5.4.2.1 NR-ARFCN and channel raster.
+     * Reference: 3GPP TS 38.101-2 section 5.4.2.1 NR-ARFCN and channel raster.
+     *
      * @return Integer value in range [0, 3279165] or {@link CellInfo#UNAVAILABLE} if unknown.
      */
-    @Override
-    public int getChannelNumber() {
+    public int getNrarfcn() {
         return mNrArfcn;
     }