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

Commit f076c3bc authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "telephony: add support for LTE and EHRPD" into gingerbread

parents 487a1483 f13114fd

telephony/java/android/telephony/ServiceState.java

+11 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2006 The Android Open Source Project

 * Copyright (c) 2010, Code Aurora Forum. All rights reserved.

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -91,6 +92,10 @@ public class ServiceState implements Parcelable { 
    public static final int RADIO_TECHNOLOGY_HSPA = 11;

    /** @hide */

    public static final int RADIO_TECHNOLOGY_EVDO_B = 12;

    /** @hide */

    public static final int RADIO_TECHNOLOGY_EHRPD = 13;

    /** @hide */

    public static final int RADIO_TECHNOLOGY_LTE = 14;



    /**

     * Available registration states for GSM, UMTS and CDMA.
@@ -424,6 +429,12 @@ public class ServiceState implements Parcelable { 
        case 12:

            radioTechnology = "EvDo rev. B";

            break;

        case RADIO_TECHNOLOGY_EHRPD:

            radioTechnology = "EHRPD";

            break;

        case RADIO_TECHNOLOGY_LTE:

            radioTechnology = "LTE";

            break;

        default:

            Log.w(LOG_TAG, "mRadioTechnology variable out of range.");

        break;

telephony/java/android/telephony/TelephonyManager.java

+6 −0
Original line number Diff line number Diff line
@@ -415,6 +415,8 @@ public class TelephonyManager { 
     * @see #NETWORK_TYPE_EVDO_A

     * @see #NETWORK_TYPE_EVDO_B

     * @see #NETWORK_TYPE_1xRTT

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_LTE

     */

    public int getNetworkType() {

        try{
@@ -465,6 +467,10 @@ public class TelephonyManager { 
                return "CDMA - EvDo rev. B";

            case NETWORK_TYPE_1xRTT:

                return "CDMA - 1xRTT";

            case NETWORK_TYPE_EHRPD:

                return "CDMA - EHRPD";

            case NETWORK_TYPE_LTE:

                return "LTE";

            default:

                return "UNKNOWN";

        }

telephony/java/com/android/internal/telephony/ServiceStateTracker.java

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ public abstract class ServiceStateTracker extends Handler { 
    protected static final int DATA_ACCESS_HSPA = 11;

    protected static final int DATA_ACCESS_CDMA_EvDo_B = 12;



    protected static final int DATA_ACCESS_LTE = 13;



    protected CommandsInterface cm;



    public ServiceState ss;