Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" am: 599866e91f am: 36aa46b9f8

Browse Source 
Change-Id: I211d1e8d41c4cf9068a349240939cd262355c027
This commit is contained in:
Automerger Merge Worker
2020-01-07 23:09:01 +00:00
parent ea5f0b585a 36aa46b9f8
commit 720a58f07c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/TelephonyRegistry.java
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: