commit 123cd32a6f35c5646cfd9c3d1a3fe49a8a3868e6
author Pengquan Meng <mpq@google.com> Thu Dec 06 17:48:05 2018 -0800
committer Pengquan Meng <mpq@google.com> Thu Jan 24 13:45:54 2019 -0800
tree d88462eecfcd41b80f11a42f437f967e402155a4
parent 1abe6aa53f0f21ff399166b561d79f7ccc48aa41

A get method for NR status in ServiceState

Bug: 111453000
Bug: 123099654
Test: build
Merged-In: I07749ff00fc9d53796208ca78721b498ed4c16fd
Change-Id: I07749ff00fc9d53796208ca78721b498ed4c16fd

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 10647e6..9fc1b6f7 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -27,6 +27,7 @@
 import android.os.Parcelable;
 import android.telephony.AccessNetworkConstants.AccessNetworkType;
 import android.telephony.NetworkRegistrationState.Domain;
+import android.telephony.NetworkRegistrationState.NRStatus;
 import android.text.TextUtils;
 
 import java.lang.annotation.Retention;
@@ -1358,6 +1359,18 @@
     }
 
     /**
+     * Get the NR 5G status of the mobile data network.
+     * @return the NR 5G status.
+     * @hide
+     */
+    public @NRStatus int getNrStatus() {
+        final NetworkRegistrationState regState = getNetworkRegistrationState(
+                NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN);
+        if (regState == null) return NetworkRegistrationState.NR_STATUS_NONE;
+        return regState.getNrStatus();
+    }
+
+    /**
      * @param nrFrequencyRange the frequency range of 5G NR.
      * @hide
      */
@@ -1533,7 +1546,6 @@
         }
     }
 
-
     /** @hide */
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
     public @TelephonyManager.NetworkType int getDataNetworkType() {