summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-10-30 07:03:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-30 07:03:21 +0000
commitaf8cf941d6c8a524a315d9fb0ef91be2994ad864 (patch)
treec2edc426a757bc8bdfa9834fcea2d0b915a66a00
parent4d2535e05dc6cb22b4f6f204db82cf2a0beac66b (diff)
parent4f26bb37a133be75b6c17717c335e8acaae595a1 (diff)
Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e am: 4f26bb37a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1480313 Change-Id: Ia029e6aa7937789b13266ccede77741470ae0822
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 23d450b38376..56c2500ee295 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2802,7 +2802,11 @@ public class TelephonyManager {
/** Current network is LTE_CA {@hide} */
@UnsupportedAppUsage
public static final int NETWORK_TYPE_LTE_CA = TelephonyProtoEnums.NETWORK_TYPE_LTE_CA; // = 19.
- /** Current network is NR(New Radio) 5G. */
+ /**
+ * Current network is NR (New Radio) 5G.
+ * This will only be returned for 5G SA.
+ * For 5G NSA, the network type will be {@link #NETWORK_TYPE_LTE}.
+ */
public static final int NETWORK_TYPE_NR = TelephonyProtoEnums.NETWORK_TYPE_NR; // 20.
private static final @NetworkType int[] NETWORK_TYPES = {