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

Commit 67b3ef27 authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

am "Telephony: Implementation for IWLAN." 

merged from goog/mirror-m-wireless-internal-release
bece926b Telephony: Implementation for IWLAN.

Change-Id: I4d55b3452428ebf9fbcfc3ba3a75cefcb2aeb0cf
parents f088849b bece926b

telephony/java/android/telephony/ServiceState.java

+12 −2
Original line number Diff line number Diff line
@@ -148,7 +148,11 @@ public class ServiceState implements Parcelable { 
    public static final int RIL_RADIO_TECHNOLOGY_GSM = 16;

    /** @hide */

    public static final int RIL_RADIO_TECHNOLOGY_TD_SCDMA = 17;



    /**

     * IWLAN

     * @hide

     */

    public static final int RIL_RADIO_TECHNOLOGY_IWLAN = 18;

    /**

     * Available registration states for GSM, UMTS and CDMA.

     */
@@ -697,6 +701,9 @@ public class ServiceState implements Parcelable { 
            case RIL_RADIO_TECHNOLOGY_GSM:

                rtString = "GSM";

                break;

            case RIL_RADIO_TECHNOLOGY_IWLAN:

                rtString = "IWLAN";

                break;

            default:

                rtString = "Unexpected";

                Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
@@ -1030,6 +1037,8 @@ public class ServiceState implements Parcelable { 
            return TelephonyManager.NETWORK_TYPE_HSPAP;

        case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:

            return TelephonyManager.NETWORK_TYPE_GSM;

        case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN:

            return TelephonyManager.NETWORK_TYPE_IWLAN;

        default:

            return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        }
@@ -1080,7 +1089,8 @@ public class ServiceState implements Parcelable { 
                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE

                || radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP

                || radioTechnology == RIL_RADIO_TECHNOLOGY_GSM

                || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA;

                || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA

                || radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN;

    }



    /** @hide */

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1212,6 +1212,10 @@ public class TelephonyManager { 
    public static final int NETWORK_TYPE_HSPAP = 15;

    /** Current network is GSM {@hide} */

    public static final int NETWORK_TYPE_GSM = 16;

     /** Current network is TD_SCDMA {@hide} */

    public static final int NETWORK_TYPE_TD_SCDMA = 17;

   /** Current network is IWLAN {@hide} */

    public static final int NETWORK_TYPE_IWLAN = 18;



    /**

     * @return the NETWORK_TYPE_xxxx for current data connection.
@@ -1382,8 +1386,10 @@ public class TelephonyManager { 
            case NETWORK_TYPE_EVDO_B:

            case NETWORK_TYPE_EHRPD:

            case NETWORK_TYPE_HSPAP:

            case NETWORK_TYPE_TD_SCDMA:

                return NETWORK_CLASS_3_G;

            case NETWORK_TYPE_LTE:

            case NETWORK_TYPE_IWLAN:

                return NETWORK_CLASS_4_G;

            default:

                return NETWORK_CLASS_UNKNOWN;
@@ -1443,6 +1449,10 @@ public class TelephonyManager { 
                return "HSPA+";

            case NETWORK_TYPE_GSM:

                return "GSM";

            case NETWORK_TYPE_TD_SCDMA:

                return "TD_SCDMA";

            case NETWORK_TYPE_IWLAN:

                return "IWLAN";

            default:

                return "UNKNOWN";

        }