From 176935c6055fd652a6ab298a01d6377b928178cd Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Tue, 23 Nov 2010 22:59:21 -0800 Subject: Promote ApnSetting to com.android.internal.telephony. Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124 --- .../com/android/internal/telephony/ApnSetting.java | 115 ++++++++++++++++++++ .../android/internal/telephony/DataConnection.java | 1 - .../telephony/cdma/CdmaDataConnection.java | 1 - .../telephony/cdma/CdmaDataConnectionTracker.java | 2 +- .../android/internal/telephony/gsm/ApnSetting.java | 116 --------------------- .../internal/telephony/gsm/GsmDataConnection.java | 1 + .../telephony/gsm/GsmDataConnectionTracker.java | 1 + 7 files changed, 118 insertions(+), 119 deletions(-) create mode 100644 telephony/java/com/android/internal/telephony/ApnSetting.java delete mode 100644 telephony/java/com/android/internal/telephony/gsm/ApnSetting.java (limited to 'telephony') diff --git a/telephony/java/com/android/internal/telephony/ApnSetting.java b/telephony/java/com/android/internal/telephony/ApnSetting.java new file mode 100644 index 0000000..5af8e35 --- /dev/null +++ b/telephony/java/com/android/internal/telephony/ApnSetting.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2006 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.telephony; + +/** + * This class represents a apn setting for create PDP link + */ +public class ApnSetting { + + public String carrier; + public String apn; + public String proxy; + public String port; + public String mmsc; + public String mmsProxy; + public String mmsPort; + public String user; + public String password; + public int authType; + public String[] types; + public int id; + public String numeric; + + + public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port, + String mmsc, String mmsProxy, String mmsPort, + String user, String password, int authType, String[] types) { + this.id = id; + this.numeric = numeric; + this.carrier = carrier; + this.apn = apn; + this.proxy = proxy; + this.port = port; + this.mmsc = mmsc; + this.mmsProxy = mmsProxy; + this.mmsPort = mmsPort; + this.user = user; + this.password = password; + this.authType = authType; + this.types = types; + } + + // data[0] = name + // data[1] = apn + // data[2] = proxy + // data[3] = port + // data[4] = username + // data[5] = password + // data[6] = server + // data[7] = mmsc + // data[8] = mmsproxy + // data[9] = mmsport + // data[10] = mcc + // data[11] = mnc + // data[12] = auth + // data[13] = first type... + public static ApnSetting fromString(String data) { + if (data == null) return null; + String[] a = data.split("\\s*,\\s*"); + if (a.length < 14) return null; + int authType = 0; + try { + authType = Integer.parseInt(a[12]); + } catch (Exception e) { + } + String[] typeArray = new String[a.length - 13]; + System.arraycopy(a, 13, typeArray, 0, a.length - 13); + return new ApnSetting(-1,a[10]+a[11],a[0],a[1],a[2],a[3],a[7],a[8], + a[9],a[4],a[5],authType,typeArray); + } + + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(carrier) + .append(", ").append(id) + .append(", ").append(numeric) + .append(", ").append(apn) + .append(", ").append(proxy) + .append(", ").append(mmsc) + .append(", ").append(mmsProxy) + .append(", ").append(mmsPort) + .append(", ").append(port) + .append(", ").append(authType); + for (String t : types) { + sb.append(", ").append(t); + } + return sb.toString(); + } + + public boolean canHandleType(String type) { + for (String t : types) { + // DEFAULT handles all, and HIPRI is handled by DEFAULT + if (t.equals(type) || t.equals(Phone.APN_TYPE_ALL) || + (t.equals(Phone.APN_TYPE_DEFAULT) && + type.equals(Phone.APN_TYPE_HIPRI))) { + return true; + } + } + return false; + } +} diff --git a/telephony/java/com/android/internal/telephony/DataConnection.java b/telephony/java/com/android/internal/telephony/DataConnection.java index c3ad9e6..2536745 100644 --- a/telephony/java/com/android/internal/telephony/DataConnection.java +++ b/telephony/java/com/android/internal/telephony/DataConnection.java @@ -16,7 +16,6 @@ package com.android.internal.telephony; -import com.android.internal.telephony.gsm.ApnSetting; import com.android.internal.util.HierarchicalState; import com.android.internal.util.HierarchicalStateMachine; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java index 8072c44..c645da5 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java @@ -20,7 +20,6 @@ import android.os.Message; import android.util.Log; import com.android.internal.telephony.DataConnection; -import com.android.internal.telephony.gsm.ApnSetting; import com.android.internal.telephony.Phone; import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.RetryManager; diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java index d7ff0c5..e003a73 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java @@ -32,6 +32,7 @@ import android.text.TextUtils; import android.util.EventLog; import android.util.Log; +import com.android.internal.telephony.ApnSetting; import com.android.internal.telephony.CommandsInterface; import com.android.internal.telephony.DataCallState; import com.android.internal.telephony.DataConnection.FailCause; @@ -39,7 +40,6 @@ import com.android.internal.telephony.DataConnection; import com.android.internal.telephony.DataConnectionTracker; import com.android.internal.telephony.EventLogTags; import com.android.internal.telephony.RetryManager; -import com.android.internal.telephony.gsm.ApnSetting; import com.android.internal.telephony.Phone; import java.util.ArrayList; diff --git a/telephony/java/com/android/internal/telephony/gsm/ApnSetting.java b/telephony/java/com/android/internal/telephony/gsm/ApnSetting.java deleted file mode 100644 index 05527af..0000000 --- a/telephony/java/com/android/internal/telephony/gsm/ApnSetting.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.telephony.gsm; - -import com.android.internal.telephony.*; -/** - * This class represents a apn setting for create PDP link - */ -public class ApnSetting { - - String carrier; - String apn; - String proxy; - String port; - String mmsc; - String mmsProxy; - String mmsPort; - String user; - String password; - int authType; - public String[] types; - int id; - String numeric; - - - public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port, - String mmsc, String mmsProxy, String mmsPort, - String user, String password, int authType, String[] types) { - this.id = id; - this.numeric = numeric; - this.carrier = carrier; - this.apn = apn; - this.proxy = proxy; - this.port = port; - this.mmsc = mmsc; - this.mmsProxy = mmsProxy; - this.mmsPort = mmsPort; - this.user = user; - this.password = password; - this.authType = authType; - this.types = types; - } - - // data[0] = name - // data[1] = apn - // data[2] = proxy - // data[3] = port - // data[4] = username - // data[5] = password - // data[6] = server - // data[7] = mmsc - // data[8] = mmsproxy - // data[9] = mmsport - // data[10] = mcc - // data[11] = mnc - // data[12] = auth - // data[13] = first type... - public static ApnSetting fromString(String data) { - if (data == null) return null; - String[] a = data.split("\\s*,\\s*"); - if (a.length < 14) return null; - int authType = 0; - try { - authType = Integer.parseInt(a[12]); - } catch (Exception e) { - } - String[] typeArray = new String[a.length - 13]; - System.arraycopy(a, 13, typeArray, 0, a.length - 13); - return new ApnSetting(-1,a[10]+a[11],a[0],a[1],a[2],a[3],a[7],a[8], - a[9],a[4],a[5],authType,typeArray); - } - - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(carrier) - .append(", ").append(id) - .append(", ").append(numeric) - .append(", ").append(apn) - .append(", ").append(proxy) - .append(", ").append(mmsc) - .append(", ").append(mmsProxy) - .append(", ").append(mmsPort) - .append(", ").append(port) - .append(", ").append(authType); - for (String t : types) { - sb.append(", ").append(t); - } - return sb.toString(); - } - - public boolean canHandleType(String type) { - for (String t : types) { - // DEFAULT handles all, and HIPRI is handled by DEFAULT - if (t.equals(type) || t.equals(Phone.APN_TYPE_ALL) || - (t.equals(Phone.APN_TYPE_DEFAULT) && - type.equals(Phone.APN_TYPE_HIPRI))) { - return true; - } - } - return false; - } -} diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index d428099..dfba8d6 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -20,6 +20,7 @@ import android.os.Message; import android.util.Log; import android.util.Patterns; +import com.android.internal.telephony.ApnSetting; import com.android.internal.telephony.DataConnection; import com.android.internal.telephony.Phone; import com.android.internal.telephony.RILConstants; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index bbfdd31..5c229b6 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -40,6 +40,7 @@ import android.util.EventLog; import android.util.Log; import com.android.internal.R; +import com.android.internal.telephony.ApnSetting; import com.android.internal.telephony.DataCallState; import com.android.internal.telephony.DataConnection; import com.android.internal.telephony.DataConnectionTracker; -- cgit v1.1