Merge "Add IpConfiguration parcelable interface implementation to system API"... (43429e77) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -4378,6 +4378,7 @@ package android.net {
		public final class IpConfiguration implements android.os.Parcelable {
		ctor public IpConfiguration();
		ctor public IpConfiguration(@NonNull android.net.IpConfiguration);
		method public int describeContents();
		method @Nullable public android.net.ProxyInfo getHttpProxy();
		method @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment();
		method @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings();
		@@ -4386,6 +4387,7 @@ package android.net {
		method public void setIpAssignment(@NonNull android.net.IpConfiguration.IpAssignment);
		method public void setProxySettings(@NonNull android.net.IpConfiguration.ProxySettings);
		method public void setStaticIpConfiguration(@Nullable android.net.StaticIpConfiguration);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.IpConfiguration> CREATOR;
		}

+2 −8

Original line number	Diff line number	Diff line
		@@ -191,18 +191,12 @@ public final class IpConfiguration implements Parcelable {
		83 * httpProxy.hashCode();
		}

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

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