Merge "Promote ApnSetting to com.android.internal.telephony." (ac711639) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/ApnSetting.java→telephony/java/com/android/internal/telephony/ApnSetting.java

+13 −14

Original line number	Original line	Diff line number	Diff line
	@@ -14,27 +14,26 @@
	* limitations under the License.		* 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		* This class represents a apn setting for create PDP link
	*/		*/
	public class ApnSetting {		public class ApnSetting {

	String carrier;		public String carrier;
	String apn;		public String apn;
	String proxy;		public String proxy;
	String port;		public String port;
	String mmsc;		public String mmsc;
	String mmsProxy;		public String mmsProxy;
	String mmsPort;		public String mmsPort;
	String user;		public String user;
	String password;		public String password;
	int authType;		public int authType;
	public String[] types;		public String[] types;
	int id;		public int id;
	String numeric;		public String numeric;


	public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port,		public ApnSetting(int id, String numeric, String carrier, String apn, String proxy, String port,

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package com.android.internal.telephony;		package com.android.internal.telephony;

	import com.android.internal.telephony.gsm.ApnSetting;

	import com.android.internal.util.HierarchicalState;		import com.android.internal.util.HierarchicalState;
	import com.android.internal.util.HierarchicalStateMachine;		import com.android.internal.util.HierarchicalStateMachine;

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.os.Message;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.telephony.DataConnection;		import com.android.internal.telephony.DataConnection;
	import com.android.internal.telephony.gsm.ApnSetting;
	import com.android.internal.telephony.Phone;		import com.android.internal.telephony.Phone;
	import com.android.internal.telephony.RILConstants;		import com.android.internal.telephony.RILConstants;
	import com.android.internal.telephony.RetryManager;		import com.android.internal.telephony.RetryManager;

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.text.TextUtils;
	import android.util.EventLog;		import android.util.EventLog;
	import android.util.Log;		import android.util.Log;

			import com.android.internal.telephony.ApnSetting;
	import com.android.internal.telephony.CommandsInterface;		import com.android.internal.telephony.CommandsInterface;
	import com.android.internal.telephony.DataCallState;		import com.android.internal.telephony.DataCallState;
	import com.android.internal.telephony.DataConnection.FailCause;		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.DataConnectionTracker;
	import com.android.internal.telephony.EventLogTags;		import com.android.internal.telephony.EventLogTags;
	import com.android.internal.telephony.RetryManager;		import com.android.internal.telephony.RetryManager;
	import com.android.internal.telephony.gsm.ApnSetting;
	import com.android.internal.telephony.Phone;		import com.android.internal.telephony.Phone;

	import java.util.ArrayList;		import java.util.ArrayList;

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import android.os.Message;
	import android.util.Log;		import android.util.Log;
	import android.util.Patterns;		import android.util.Patterns;

			import com.android.internal.telephony.ApnSetting;
	import com.android.internal.telephony.DataConnection;		import com.android.internal.telephony.DataConnection;
	import com.android.internal.telephony.Phone;		import com.android.internal.telephony.Phone;
	import com.android.internal.telephony.RILConstants;		import com.android.internal.telephony.RILConstants;