Merge "OMH code enhancements" (7186a3cf) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/CdmaDataProfileTracker.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -445,17 +445,6 @@ public final class CdmaDataProfileTracker extends Handler {
	return false;		return false;
	}		}

	protected String[] getActiveApnTypes() {
	String[] result;
	if (mActiveDp != null) {
	result = mActiveDp.getServiceTypes();
	} else {
	result = new String[1];
	result[0] = PhoneConstants.APN_TYPE_DEFAULT;
	}
	return result;
	}

	protected void log(String s) {		protected void log(String s) {
	Log.d(LOG_TAG, "[CdmaDataProfileTracker] " + s);		Log.d(LOG_TAG, "[CdmaDataProfileTracker] " + s);
	}		}

src/java/com/android/internal/telephony/dataconnection/DataProfile.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -38,9 +38,6 @@ public abstract class DataProfile {
	public String mmsProxy;		public String mmsProxy;
	public String mmsPort;		public String mmsPort;

	/* ID of the profile in the modem */
	protected int mProfileId = 0;

	/**		/**
	* Current status of APN		* Current status of APN
	* true : enabled APN, false : disabled APN.		* true : enabled APN, false : disabled APN.
	@@ -117,10 +114,6 @@ public abstract class DataProfile {
	mDc = null;		mDc = null;
	}		}

	public String[] getServiceTypes() {
	return types.clone();
	}

	public String toString() {		public String toString() {
	StringBuilder sb = new StringBuilder();		StringBuilder sb = new StringBuilder();
	sb.append("[DataProfile] ")		sb.append("[DataProfile] ")
	@@ -140,10 +133,6 @@ public abstract class DataProfile {
	return sb.toString();		return sb.toString();
	}		}

	public void setProfileId(int profileId) {
	mProfileId = profileId;
	}

	/* some way to identify this data profile uniquely */		/* some way to identify this data profile uniquely */
	public abstract String toHash();		public abstract String toHash();

src/java/com/android/internal/telephony/dataconnection/DataProfileOmh.java

+5 −18

Original line number	Original line	Diff line number	Diff line
	@@ -108,30 +108,22 @@ public class DataProfileOmh extends DataProfile {
	/* Priority of this profile in the modem */		/* Priority of this profile in the modem */
	private int mPriority = 0;		private int mPriority = 0;

	private static String PROFILE_TYPE = "DataProfileOmh";		/* ID of the profile in the modem */
			private int mProfileId = 0;

	public DataProfileOmh(int id, String numeric, String name, String user, String password,		private static String PROFILE_TYPE = "DataProfileOmh";
	int authType, String[] types, String protocol, String roamingProtocol, int bearer) {
	super(id, numeric, name, user, password,
	authType, types, protocol, roamingProtocol, bearer);
	}

	public DataProfileOmh() {		public DataProfileOmh(int profileId, int priority) {
	/**		/**
	* Default values if the profile is being used for only selective		* Default values if the profile is being used for only selective
	* fields e.g: just profileId and Priority. use case is when rest of the		* fields e.g: just profileId and Priority. use case is when rest of the
	* fields can be read and processed only by the modem		* fields can be read and processed only by the modem
	*/		*/
	this(0, "", PROFILE_TYPE, null, null,		super(0, "", PROFILE_TYPE, null, null,
	RILConstants.SETUP_DATA_AUTH_PAP_CHAP, null,		RILConstants.SETUP_DATA_AUTH_PAP_CHAP, null,
	"IP", "IP", 0);		"IP", "IP", 0);
	}

	public DataProfileOmh(int profileId, int priority) {
	this();
	this.mProfileId = profileId;		this.mProfileId = profileId;
	this.mPriority = priority;		this.mPriority = priority;
	this.types = new String[0];
	}		}

	@Override		@Override
	@@ -206,11 +198,6 @@ public class DataProfileOmh extends DataProfile {
	return mPriority;		return mPriority;
	}		}

	public String[] getServiceTypes() {
	String[] dummy = null;
	return dummy;
	}

	public void addServiceType(DataProfileTypeModem modemProfile) {		public void addServiceType(DataProfileTypeModem modemProfile) {
	serviceTypeMasks \|= modemProfile.getid();		serviceTypeMasks \|= modemProfile.getid();