Merge "Supported v1.3 data profile" (1e4f6fbe) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −8

Original line number	Diff line number	Diff line
		@@ -5405,17 +5405,12 @@ package android.telephony.data {
		}

		public final class DataProfile implements android.os.Parcelable {
		ctor public DataProfile(int, java.lang.String, java.lang.String, int, java.lang.String, java.lang.String, int, int, int, int, boolean, int, java.lang.String, int, int, java.lang.String, java.lang.String, boolean);
		ctor public DataProfile(android.os.Parcel);
		method public int describeContents();
		method public java.lang.String getApn();
		method public int getAuthType();
		method public int getBearerBitmap();
		method public int getMaxConns();
		method public int getMaxConnsTime();
		method public int getMtu();
		method public java.lang.String getMvnoMatchData();
		method public java.lang.String getMvnoType();
		method public java.lang.String getPassword();
		method public int getProfileId();
		method public java.lang.String getProtocol();
		@@ -5425,9 +5420,8 @@ package android.telephony.data {
		method public java.lang.String getUserName();
		method public int getWaitTime();
		method public boolean isEnabled();
		method public boolean isModemCognitive();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telephony.data.DataProfile> CREATOR;
		method public boolean isPersistent();
		method public boolean isPreferred();
		field public static final int TYPE_3GPP = 1; // 0x1
		field public static final int TYPE_3GPP2 = 2; // 0x2
		field public static final int TYPE_COMMON = 0; // 0x0

telephony/java/android/telephony/data/ApnSetting.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -257,7 +257,7 @@ public class ApnSetting implements Parcelable {

		private final int mProfileId;

		private final boolean mModemCognitive;
		private final boolean mPersistent;
		private final int mMaxConns;
		private final int mWaitTime;
		private final int mMaxConnsTime;
		@@ -290,13 +290,13 @@ public class ApnSetting implements Parcelable {
		}

		/**
		* Returns if the APN setting is to be set in modem.
		* Returns if the APN setting is persistent on the modem.
		*
		* @return is the APN setting to be set in modem
		* @hide
		*/
		public boolean getModemCognitive() {
		return mModemCognitive;
		public boolean isPersistent() {
		return mPersistent;
		}

		/**
		@@ -616,7 +616,7 @@ public class ApnSetting implements Parcelable {
		this.mCarrierEnabled = builder.mCarrierEnabled;
		this.mNetworkTypeBitmask = builder.mNetworkTypeBitmask;
		this.mProfileId = builder.mProfileId;
		this.mModemCognitive = builder.mModemCognitive;
		this.mPersistent = builder.mModemCognitive;
		this.mMaxConns = builder.mMaxConns;
		this.mWaitTime = builder.mWaitTime;
		this.mMaxConnsTime = builder.mMaxConnsTime;
		@@ -740,7 +740,7 @@ public class ApnSetting implements Parcelable {
		apn.mProxyAddress, apn.mProxyPort, apn.mMmsc, apn.mMmsProxyAddress,
		apn.mMmsProxyPort, apn.mUser, apn.mPassword, apn.mAuthType, apn.mApnTypeBitmask,
		apn.mProtocol, apn.mRoamingProtocol, apn.mCarrierEnabled, apn.mNetworkTypeBitmask,
		apn.mProfileId, apn.mModemCognitive, apn.mMaxConns, apn.mWaitTime,
		apn.mProfileId, apn.mPersistent, apn.mMaxConns, apn.mWaitTime,
		apn.mMaxConnsTime, apn.mMtu, apn.mMvnoType, apn.mMvnoMatchData, apn.mApnSetId);
		}

		@@ -947,7 +947,7 @@ public class ApnSetting implements Parcelable {
		sb.append(", ").append(PROTOCOL_INT_MAP.get(mRoamingProtocol));
		sb.append(", ").append(mCarrierEnabled);
		sb.append(", ").append(mProfileId);
		sb.append(", ").append(mModemCognitive);
		sb.append(", ").append(mPersistent);
		sb.append(", ").append(mMaxConns);
		sb.append(", ").append(mWaitTime);
		sb.append(", ").append(mMaxConnsTime);
		@@ -1038,7 +1038,7 @@ public class ApnSetting implements Parcelable {
		&& Objects.equals(mRoamingProtocol, other.mRoamingProtocol)
		&& Objects.equals(mCarrierEnabled, other.mCarrierEnabled)
		&& Objects.equals(mProfileId, other.mProfileId)
		&& Objects.equals(mModemCognitive, other.mModemCognitive)
		&& Objects.equals(mPersistent, other.mPersistent)
		&& Objects.equals(mMaxConns, other.mMaxConns)
		&& Objects.equals(mWaitTime, other.mWaitTime)
		&& Objects.equals(mMaxConnsTime, other.mMaxConnsTime)
		@@ -1084,7 +1084,7 @@ public class ApnSetting implements Parcelable {
		&& (!isDataRoaming \|\| Objects.equals(mRoamingProtocol, other.mRoamingProtocol))
		&& Objects.equals(mCarrierEnabled, other.mCarrierEnabled)
		&& Objects.equals(mProfileId, other.mProfileId)
		&& Objects.equals(mModemCognitive, other.mModemCognitive)
		&& Objects.equals(mPersistent, other.mPersistent)
		&& Objects.equals(mMaxConns, other.mMaxConns)
		&& Objects.equals(mWaitTime, other.mWaitTime)
		&& Objects.equals(mMaxConnsTime, other.mMaxConnsTime)

telephony/java/android/telephony/data/DataProfile.java

+27 −35

Original line number	Diff line number	Diff line
		@@ -68,17 +68,15 @@ public final class DataProfile implements Parcelable {

		private final int mMtu;

		private final String mMvnoType;
		private final boolean mPersistent;

		private final String mMvnoMatchData;
		private final boolean mPreferred;

		private final boolean mModemCognitive;

		public DataProfile(int profileId, String apn, String protocol, int authType,
		String userName, String password, int type, int maxConnsTime, int maxConns,
		int waitTime, boolean enabled, int supportedApnTypesBitmap, String roamingProtocol,
		int bearerBitmap, int mtu, String mvnoType, String mvnoMatchData,
		boolean modemCognitive) {
		/** @hide */
		public DataProfile(int profileId, String apn, String protocol, int authType, String userName,
		String password, int type, int maxConnsTime, int maxConns, int waitTime,
		boolean enabled, int supportedApnTypesBitmap, String roamingProtocol,
		int bearerBitmap, int mtu, boolean persistent, boolean preferred) {

		this.mProfileId = profileId;
		this.mApn = apn;
		@@ -100,11 +98,11 @@ public final class DataProfile implements Parcelable {
		this.mRoamingProtocol = roamingProtocol;
		this.mBearerBitmap = bearerBitmap;
		this.mMtu = mtu;
		this.mMvnoType = mvnoType;
		this.mMvnoMatchData = mvnoMatchData;
		this.mModemCognitive = modemCognitive;
		this.mPersistent = persistent;
		this.mPreferred = preferred;
		}

		/** @hide */
		public DataProfile(Parcel source) {
		mProfileId = source.readInt();
		mApn = source.readString();
		@@ -121,9 +119,8 @@ public final class DataProfile implements Parcelable {
		mRoamingProtocol = source.readString();
		mBearerBitmap = source.readInt();
		mMtu = source.readInt();
		mMvnoType = source.readString();
		mMvnoMatchData = source.readString();
		mModemCognitive = source.readBoolean();
		mPersistent = source.readBoolean();
		mPreferred = source.readBoolean();
		}

		/**
		@@ -207,23 +204,17 @@ public final class DataProfile implements Parcelable {
		public int getMtu() { return mMtu; }

		/**
		* @return The MVNO type: possible values are "imsi", "gid", "spn".
		*/
		public String getMvnoType() { return mMvnoType; }

		/**
		* @return The MVNO match data. For example,
		* SPN: A MOBILE, BEN NL, ...
		* IMSI: 302720x94, 2060188, ...
		* GID: 4E, 33, ...
		* @return {@code true} if modem must persist this data profile.
		*/
		public String getMvnoMatchData() { return mMvnoMatchData; }
		public boolean isPersistent() { return mPersistent; }

		/**
		* @return True if the data profile was sent to the modem through setDataProfile earlier.
		* @return {@code true} if this data profile was used to bring up the last default
		* (i.e internet) data connection successfully.
		*/
		public boolean isModemCognitive() { return mModemCognitive; }
		public boolean isPreferred() { return mPreferred; }

		/** @hide */
		@Override
		public int describeContents() {
		return 0;
		@@ -233,11 +224,11 @@ public final class DataProfile implements Parcelable {
		public String toString() {
		return "DataProfile=" + mProfileId + "/" + mProtocol + "/" + mAuthType
		+ "/" + (Build.IS_USER ? "*//**" :
		(mApn + "/" + mUserName + "/" + mPassword))
		+ "/" + mType + "/" + mMaxConnsTime
		+ "/" + mMaxConns + "/" + mWaitTime + "/" + mEnabled + "/"
		+ mSupportedApnTypesBitmap + "/" + mRoamingProtocol + "/" + mBearerBitmap + "/"
		+ mMtu + "/" + mMvnoType + "/" + mMvnoMatchData + "/" + mModemCognitive;
		(mApn + "/" + mUserName + "/" + mPassword)) + "/" + mType + "/"
		+ mMaxConnsTime + "/" + mMaxConns + "/"
		+ mWaitTime + "/" + mEnabled + "/" + mSupportedApnTypesBitmap + "/"
		+ mRoamingProtocol + "/" + mBearerBitmap + "/" + mMtu + "/" + mPersistent + "/"
		+ mPreferred;
		}

		@Override
		@@ -246,6 +237,7 @@ public final class DataProfile implements Parcelable {
		return (o == this \|\| toString().equals(o.toString()));
		}

		/** @hide */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(mProfileId);
		@@ -263,11 +255,11 @@ public final class DataProfile implements Parcelable {
		dest.writeString(mRoamingProtocol);
		dest.writeInt(mBearerBitmap);
		dest.writeInt(mMtu);
		dest.writeString(mMvnoType);
		dest.writeString(mMvnoMatchData);
		dest.writeBoolean(mModemCognitive);
		dest.writeBoolean(mPersistent);
		dest.writeBoolean(mPreferred);
		}

		/** @hide */
		public static final Parcelable.Creator<DataProfile> CREATOR =
		new Parcelable.Creator<DataProfile>() {
		@Override