Telephony: Implementation for IWLAN.

Introduce new RAT as IWLAN.
- Allow registration polling in airplane mode.
- Allow non-default PDP activation for iwlan RAT.

Implementation of iwlan and wwan coexistence.
- A new callback event for unsol oem hook response to indicate
  if cellular and iwlan RAT co-exists.
- If co-existence is possible then allow default PDP activation
  along with other PDPs.

Change-Id: Icc6f8111ec3c86ec06e8facd5a5b60b4d5e08e78
This commit is contained in:
Yashdev Singh
2015-02-23 13:04:51 -08:00
committed by Etan Cohen
parent 3882afbd97
commit bece926b51
3 changed files with 23 additions and 2 deletions

View File

@@ -430,6 +430,7 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
networkTypeStr = "iden"; networkTypeStr = "iden";
break; break;
case TelephonyManager.NETWORK_TYPE_LTE: case TelephonyManager.NETWORK_TYPE_LTE:
case TelephonyManager.NETWORK_TYPE_IWLAN:
networkTypeStr = "lte"; networkTypeStr = "lte";
break; break;
case TelephonyManager.NETWORK_TYPE_EHRPD: case TelephonyManager.NETWORK_TYPE_EHRPD:

View File

@@ -148,7 +148,11 @@ public class ServiceState implements Parcelable {
public static final int RIL_RADIO_TECHNOLOGY_GSM = 16; public static final int RIL_RADIO_TECHNOLOGY_GSM = 16;
/** @hide */ /** @hide */
public static final int RIL_RADIO_TECHNOLOGY_TD_SCDMA = 17; 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. * Available registration states for GSM, UMTS and CDMA.
*/ */
@@ -697,6 +701,9 @@ public class ServiceState implements Parcelable {
case RIL_RADIO_TECHNOLOGY_GSM: case RIL_RADIO_TECHNOLOGY_GSM:
rtString = "GSM"; rtString = "GSM";
break; break;
case RIL_RADIO_TECHNOLOGY_IWLAN:
rtString = "IWLAN";
break;
default: default:
rtString = "Unexpected"; rtString = "Unexpected";
Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt); Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
@@ -1030,6 +1037,8 @@ public class ServiceState implements Parcelable {
return TelephonyManager.NETWORK_TYPE_HSPAP; return TelephonyManager.NETWORK_TYPE_HSPAP;
case ServiceState.RIL_RADIO_TECHNOLOGY_GSM: case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
return TelephonyManager.NETWORK_TYPE_GSM; return TelephonyManager.NETWORK_TYPE_GSM;
case ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN:
return TelephonyManager.NETWORK_TYPE_IWLAN;
default: default:
return TelephonyManager.NETWORK_TYPE_UNKNOWN; return TelephonyManager.NETWORK_TYPE_UNKNOWN;
} }
@@ -1080,7 +1089,8 @@ public class ServiceState implements Parcelable {
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP || radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP
|| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM || radioTechnology == RIL_RADIO_TECHNOLOGY_GSM
|| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA; || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN;
} }
/** @hide */ /** @hide */

View File

@@ -1213,6 +1213,10 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_HSPAP = 15; public static final int NETWORK_TYPE_HSPAP = 15;
/** Current network is GSM {@hide} */ /** Current network is GSM {@hide} */
public static final int NETWORK_TYPE_GSM = 16; 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. * @return the NETWORK_TYPE_xxxx for current data connection.
@@ -1383,8 +1387,10 @@ public class TelephonyManager {
case NETWORK_TYPE_EVDO_B: case NETWORK_TYPE_EVDO_B:
case NETWORK_TYPE_EHRPD: case NETWORK_TYPE_EHRPD:
case NETWORK_TYPE_HSPAP: case NETWORK_TYPE_HSPAP:
case NETWORK_TYPE_TD_SCDMA:
return NETWORK_CLASS_3_G; return NETWORK_CLASS_3_G;
case NETWORK_TYPE_LTE: case NETWORK_TYPE_LTE:
case NETWORK_TYPE_IWLAN:
return NETWORK_CLASS_4_G; return NETWORK_CLASS_4_G;
default: default:
return NETWORK_CLASS_UNKNOWN; return NETWORK_CLASS_UNKNOWN;
@@ -1444,6 +1450,10 @@ public class TelephonyManager {
return "HSPA+"; return "HSPA+";
case NETWORK_TYPE_GSM: case NETWORK_TYPE_GSM:
return "GSM"; return "GSM";
case NETWORK_TYPE_TD_SCDMA:
return "TD_SCDMA";
case NETWORK_TYPE_IWLAN:
return "IWLAN";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }