Merge "Commented out NETWORK_TYPE_LTE_CA in logging function"

am: 599866e91f

Change-Id: Iaa4d6c16a0f8a68bf0736be95b514ff6f702da26
This commit is contained in:
Daniel Bright
2020-01-07 14:58:30 -08:00
committed by android-build-merger

View File

@@ -2645,8 +2645,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
return "TD_SCDMA";
case TelephonyManager.NETWORK_TYPE_IWLAN:
return "IWLAN";
case TelephonyManager.NETWORK_TYPE_LTE_CA:
return "LTE_CA";
//TODO: This network type is marked as hidden because it is not a
// true network type and we are looking to remove it completely from the available list
// of network types. Since this method is only used for logging, in the event that this
// network type is selected, the log will read as "Unknown."
//case TelephonyManager.NETWORK_TYPE_LTE_CA:
// return "LTE_CA";
case TelephonyManager.NETWORK_TYPE_NR:
return "NR";
default: