Revert "Hide IpConfiguration" (e277433e) · Commits · e / os / android_frameworks_base

core/java/android/net/IpConfiguration.java

+19 −5

Original line number	Original line	Diff line number	Diff line
	@@ -23,11 +23,13 @@ import android.util.Log;

	/**		/**
	* A class representing a configured network.		* A class representing a configured network.
	* @hide
	*/		*/
	public class IpConfiguration implements Parcelable {		public class IpConfiguration implements Parcelable {
	private static final String TAG = "IpConfiguration";		private static final String TAG = "IpConfiguration";

			/**
			* @hide
			*/
	public enum IpAssignment {		public enum IpAssignment {
	/* Use statically configured IP settings. Configuration can be accessed		/* Use statically configured IP settings. Configuration can be accessed
	* with linkProperties */		* with linkProperties */
	@@ -39,8 +41,14 @@ public class IpConfiguration implements Parcelable {
	UNASSIGNED		UNASSIGNED
	}		}

			/**
			* @hide
			*/
	public IpAssignment ipAssignment;		public IpAssignment ipAssignment;

			/**
			* @hide
			*/
	public enum ProxySettings {		public enum ProxySettings {
	/* No proxy is to be used. Any existing proxy settings		/* No proxy is to be used. Any existing proxy settings
	* should be cleared. */		* should be cleared. */
	@@ -56,8 +64,14 @@ public class IpConfiguration implements Parcelable {
	PAC		PAC
	}		}

			/**
			* @hide
			*/
	public ProxySettings proxySettings;		public ProxySettings proxySettings;

			/**
			* @hide
			*/
	public LinkProperties linkProperties;		public LinkProperties linkProperties;

	public IpConfiguration() {		public IpConfiguration() {
	@@ -66,7 +80,7 @@ public class IpConfiguration implements Parcelable {
	linkProperties = new LinkProperties();		linkProperties = new LinkProperties();
	}		}

	/** copy constructor */		/** copy constructor {@hide} */
	public IpConfiguration(IpConfiguration source) {		public IpConfiguration(IpConfiguration source) {
	if (source != null) {		if (source != null) {
	ipAssignment = source.ipAssignment;		ipAssignment = source.ipAssignment;
	@@ -110,19 +124,19 @@ public class IpConfiguration implements Parcelable {
	return sbuf.toString();		return sbuf.toString();
	}		}

	/** Implement the Parcelable interface */		/** Implement the Parcelable interface {@hide} */
	public int describeContents() {		public int describeContents() {
	return 0;		return 0;
	}		}

	/** Implement the Parcelable interface */		/** Implement the Parcelable interface {@hide} */
	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
	dest.writeString(ipAssignment.name());		dest.writeString(ipAssignment.name());
	dest.writeString(proxySettings.name());		dest.writeString(proxySettings.name());
	dest.writeParcelable(linkProperties, flags);		dest.writeParcelable(linkProperties, flags);
	}		}

	/** Implement the Parcelable interface */		/** Implement the Parcelable interface {@hide} */
	public static final Creator<IpConfiguration> CREATOR =		public static final Creator<IpConfiguration> CREATOR =
	new Creator<IpConfiguration>() {		new Creator<IpConfiguration>() {
	public IpConfiguration createFromParcel(Parcel in) {		public IpConfiguration createFromParcel(Parcel in) {