Promote ApnSetting to com.android.internal.telephony.
Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124
diff --git a/telephony/java/com/android/internal/telephony/gsm/ApnSetting.java b/telephony/java/com/android/internal/telephony/ApnSetting.java
similarity index 90%
rename from telephony/java/com/android/internal/telephony/gsm/ApnSetting.java
rename to telephony/java/com/android/internal/telephony/ApnSetting.java
index 05527af..5af8e35 100644
--- a/telephony/java/com/android/internal/telephony/gsm/ApnSetting.java
+++ b/telephony/java/com/android/internal/telephony/ApnSetting.java
@@ -14,27 +14,26 @@
* limitations under the License.
*/
-package com.android.internal.telephony.gsm;
+package com.android.internal.telephony;
-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 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;
- int id;
- String numeric;
+ public int id;
+ public String numeric;
public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port,
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..c645da5c 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.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.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.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/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.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.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;