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

Commit 22e68d68 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Telephony: Implementation for IWLAN."

parents 26203176 a2327f12

core/java/android/net/MobileDataStateTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
            networkTypeStr = "iden";

            break;

        case TelephonyManager.NETWORK_TYPE_LTE:

        case TelephonyManager.NETWORK_TYPE_IWLAN:

            networkTypeStr = "lte";

            break;

        case TelephonyManager.NETWORK_TYPE_EHRPD:

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1413,4 +1413,8 @@ 
    <!-- Configuration to set delete any partial segments expire age -->

    <!-- 30 days by default (60 * 60 * 1000) * 24 * 30 , no long so use string-->

    <string name="config_partial_segment_expire_age">2592000000</string>



    <!-- Configuration to enable non-default PDP during IWLAN -->

    <bool name="config_feature_iwlan_enabled">false</bool>



</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ 
  <java-symbol type="bool" name="config_radio_reset_on_regular_deactivation" />

  <java-symbol type="bool" name="config_send_sms1x_on_voice_call" />

  <java-symbol type="bool" name="config_ascii_7bit_support_for_long_message" />

  <java-symbol type="bool" name="config_feature_iwlan_enabled" />



  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_extraFreeKbytesAdjust" />

telephony/java/android/telephony/ServiceState.java

+10 −2
Original line number Diff line number Diff line
@@ -151,7 +151,11 @@ public class ServiceState implements Parcelable { 
     * @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.

     */
@@ -541,6 +545,9 @@ public class ServiceState implements Parcelable { 
            case RIL_RADIO_TECHNOLOGY_TD_SCDMA:

                rtString = "TD-SCDMA";

                break;

            case RIL_RADIO_TECHNOLOGY_IWLAN:

                rtString = "IWLAN";

                break;

            default:

                rtString = "Unexpected";

                Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
@@ -859,7 +866,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

+5 −1
Original line number Diff line number Diff line
@@ -660,7 +660,8 @@ public class TelephonyManager { 
    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.
@@ -771,6 +772,7 @@ public class TelephonyManager { 
            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;
@@ -825,6 +827,8 @@ public class TelephonyManager { 
                return "GSM";

            case NETWORK_TYPE_TD_SCDMA:

                return "TD-SCDMA";

            case NETWORK_TYPE_IWLAN:

                return "IWLAN";

            default:

                return "UNKNOWN";

        }