From 677cfaa2a0e343ee8e638ad5c23213545fd14b15 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Wed, 31 Jan 2018 00:33:20 -0800 Subject: Added support for the new 1.2 data setup/deactivate API Added support for the 1.2 IRadio APIs that support IWLAN handover. Test: Telephony sanity tests Bug: 64132030 Merged-In: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65 Change-Id: I8c962bb45bc4d42610faa32f0ee36080e8e6cb65 (cherry picked from commit 08063d6c1bb64d2b65fe08bfc04d00f3f0fc856f) --- telephony/java/android/telephony/ServiceState.java | 37 ++++++++++++++++++++-- .../android/internal/telephony/RILConstants.java | 5 --- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 90a3677d1796..1176491907ce 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -22,13 +22,13 @@ import android.annotation.SystemApi; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.Arrays; - import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -1339,6 +1339,39 @@ public class ServiceState implements Parcelable { } } + /** @hide */ + public static int rilRadioTechnologyToAccessNetworkType(@RilRadioTechnology int rt) { + switch(rt) { + case RIL_RADIO_TECHNOLOGY_GPRS: + case RIL_RADIO_TECHNOLOGY_EDGE: + case RIL_RADIO_TECHNOLOGY_GSM: + return AccessNetworkType.GERAN; + case RIL_RADIO_TECHNOLOGY_UMTS: + case RIL_RADIO_TECHNOLOGY_HSDPA: + case RIL_RADIO_TECHNOLOGY_HSPAP: + case RIL_RADIO_TECHNOLOGY_HSUPA: + case RIL_RADIO_TECHNOLOGY_HSPA: + case RIL_RADIO_TECHNOLOGY_TD_SCDMA: + return AccessNetworkType.UTRAN; + case RIL_RADIO_TECHNOLOGY_IS95A: + case RIL_RADIO_TECHNOLOGY_IS95B: + case RIL_RADIO_TECHNOLOGY_1xRTT: + case RIL_RADIO_TECHNOLOGY_EVDO_0: + case RIL_RADIO_TECHNOLOGY_EVDO_A: + case RIL_RADIO_TECHNOLOGY_EVDO_B: + case RIL_RADIO_TECHNOLOGY_EHRPD: + return AccessNetworkType.CDMA2000; + case RIL_RADIO_TECHNOLOGY_LTE: + case RIL_RADIO_TECHNOLOGY_LTE_CA: + return AccessNetworkType.EUTRAN; + case RIL_RADIO_TECHNOLOGY_IWLAN: + return AccessNetworkType.IWLAN; + case RIL_RADIO_TECHNOLOGY_UNKNOWN: + default: + return AccessNetworkType.UNKNOWN; + } + } + /** @hide */ public int getDataNetworkType() { return rilRadioTechnologyToNetworkType(mRilDataRadioTechnology); diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index cdee9e6f2d73..a3a30807986e 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -220,11 +220,6 @@ public interface RILConstants { String SETUP_DATA_PROTOCOL_IPV6 = "IPV6"; String SETUP_DATA_PROTOCOL_IPV4V6 = "IPV4V6"; - /* Deactivate data call reasons */ - int DEACTIVATE_REASON_NONE = 0; - int DEACTIVATE_REASON_RADIO_OFF = 1; - int DEACTIVATE_REASON_PDP_RESET = 2; - /* NV config radio reset types. */ int NV_CONFIG_RELOAD_RESET = 1; int NV_CONFIG_ERASE_RESET = 2; -- cgit v1.2.3-59-g8ed1b