summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sarah Chin <sarahchin@google.com> 2020-07-23 20:17:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-23 20:17:26 +0000
commit0cb19b5ea585630be6f2cd30bf96ae417524cf3b (patch)
treeb35fbdf9c6fb76d09020124e5df101d8e21647dc
parent8d699af3146542264fda1be87a67a739bfb26949 (diff)
parent20c0cd6b4c49da5925fb92508cdf46056e39a42f (diff)
Merge changes from topic "phone_info_5g" am: 20c0cd6b4c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371137 Change-Id: I238d65654a2150f1497730f8b647818659c5a7c5
-rw-r--r--telephony/java/android/telephony/NetworkRegistrationInfo.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/NetworkRegistrationInfo.java b/telephony/java/android/telephony/NetworkRegistrationInfo.java
index 68753e11d395..aee1e84ca356 100644
--- a/telephony/java/android/telephony/NetworkRegistrationInfo.java
+++ b/telephony/java/android/telephony/NetworkRegistrationInfo.java
@@ -594,7 +594,8 @@ public final class NetworkRegistrationInfo implements Parcelable {
return "Unknown reg state " + registrationState;
}
- private static String nrStateToString(@NRState int nrState) {
+ /** @hide */
+ public static String nrStateToString(@NRState int nrState) {
switch (nrState) {
case NR_STATE_RESTRICTED:
return "RESTRICTED";