Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add IpConfiguration parcelable interface implementation to system API"

Browse Source
This commit is contained in:
Aaron Huang
2019-11-28 09:56:58 +00:00
committed by Gerrit Code Review
parent 5f01cb6ddc 42daacaea7
commit 76101baf9a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -4088,6 +4088,7 @@ package android.net {
public final class IpConfiguration implements android.os.Parcelable { public final class IpConfiguration implements android.os.Parcelable {
ctor public IpConfiguration(); ctor public IpConfiguration();
ctor public IpConfiguration(@NonNull android.net.IpConfiguration); ctor public IpConfiguration(@NonNull android.net.IpConfiguration);
method public int describeContents();
method @Nullable public android.net.ProxyInfo getHttpProxy(); method @Nullable public android.net.ProxyInfo getHttpProxy();
method @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment(); method @NonNull public android.net.IpConfiguration.IpAssignment getIpAssignment();
method @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings(); method @NonNull public android.net.IpConfiguration.ProxySettings getProxySettings();
@@ -4096,6 +4097,7 @@ package android.net {
method public void setIpAssignment(@NonNull android.net.IpConfiguration.IpAssignment); method public void setIpAssignment(@NonNull android.net.IpConfiguration.IpAssignment);
method public void setProxySettings(@NonNull android.net.IpConfiguration.ProxySettings); method public void setProxySettings(@NonNull android.net.IpConfiguration.ProxySettings);
method public void setStaticIpConfiguration(@Nullable android.net.StaticIpConfiguration); 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; field @NonNull public static final android.os.Parcelable.Creator<android.net.IpConfiguration> CREATOR;
} }

10
core/java/android/net/IpConfiguration.java
View File

@@ -191,18 +191,12 @@ public final class IpConfiguration implements Parcelable {
83 * httpProxy.hashCode(); 83 * httpProxy.hashCode();
} }
/** /** 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(@NonNull Parcel dest, int flags) { public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(ipAssignment.name()); dest.writeString(ipAssignment.name());
dest.writeString(proxySettings.name()); dest.writeString(proxySettings.name());