commit 939c573b128b54cf5b2b70a3338905ae3f9ccb6a
author Pengquan Meng <mpq@google.com> Wed Mar 06 15:31:46 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Mar 06 15:31:46 2019 -0800
tree ae3b20247d254fa5c08699a31d9690da110eaaad
parent 513299e2c3c7bfd598e746975601983e936ca014
parent 746e386b863efa879cc826b05a1e41b4781ab246

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

Change-Id: I918c68d7628a08784b9c20bfdf89365fd1250c6e

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index d26bb22..02e2847 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -44418,10 +44418,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 b48388e..5a89ae8 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;
     }