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

Commit ede2cffb authored by Yashdev Singh's avatar Yashdev Singh Committed by Steve Kondik
Browse files

Telephony: Implementation for IWLAN. 

- Introduce new RAT as IWLAN.
CRs-Fixed: 600118

Handle IWLAN radio technology in ServiceState.
rilRadioTechnologyToNetworkType() in ServiceState returns UNKNOWN,
if radio technology is chosen as IWLAN.
Add the code to handle IWLAN radio technology in ServiceState.
CRs-Fixed: 641631

Telephony: Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response.
CRs-Fixed: 628227

Change-Id: I96e4cb614843795ee9c13e02823cf7457fb1bda7
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
parent c80d34f0

core/java/android/net/MobileDataStateTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,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

+10 −0
Original line number Diff line number Diff line
@@ -2013,4 +2013,14 @@ 
        <item>Trying to delete call log</item>

        <item>Trying to turn on mobile data</item>

    </string-array>



    <!-- Whether cpu boost is enabled for overscroller fling. -->

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



    <!-- Whether cpu boost is enabled for horizontal scroll. -->

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



    <!-- 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
@@ -350,6 +350,7 @@ 


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



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

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

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

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

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.

     */
@@ -538,6 +542,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);
@@ -806,6 +813,8 @@ public class ServiceState implements Parcelable { 
            return TelephonyManager.NETWORK_TYPE_GSM;

        case ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA:

            return TelephonyManager.NETWORK_TYPE_TD_SCDMA;

        case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN:

            return TelephonyManager.NETWORK_TYPE_IWLAN;

        default:

            return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        }
@@ -856,7 +865,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
@@ -1140,7 +1140,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;



    /**

     * Convert network type to String
@@ -1364,6 +1365,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;
@@ -1425,6 +1427,8 @@ public class TelephonyManager { 
                return "GSM";

            case NETWORK_TYPE_TD_SCDMA:

                return "TD-SCDMA";

            case NETWORK_TYPE_IWLAN:

                return "IWLAN";

            default:

                return "UNKNOWN";

        }