Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 720a58f0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" am: 599866e9 am: 36aa46b9 

Change-Id: I211d1e8d41c4cf9068a349240939cd262355c027
parents ea5f0b58 36aa46b9

services/core/java/com/android/server/TelephonyRegistry.java

+8 −2
Original line number Original line Diff line number Diff line
@@ -2645,8 +2645,14 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                return "TD_SCDMA";

                return "TD_SCDMA";

            case TelephonyManager.NETWORK_TYPE_IWLAN:

            case TelephonyManager.NETWORK_TYPE_IWLAN:

                return "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:

            case TelephonyManager.NETWORK_TYPE_NR:

                return "NR";

                return "NR";

            default:

            default: