Merge changes from topic "phone_info_5g" am: 20c0cd6b4c am: 0cb19b5ea5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371137

Change-Id: Ib6de67754f15b6fc1d54386a0552fadb7b8a778c
This commit is contained in:
Sarah Chin
2020-07-23 20:31:51 +00:00
committed by Automerger Merge Worker

View File

@@ -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";