Merge "Promote ApnSetting to com.android.internal.telephony."
This commit is contained in:
@@ -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,
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user