Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42daacae authored by Aaron Huang's avatar Aaron Huang
Browse files

Add IpConfiguration parcelable interface implementation to system API 

API lint robot warnings that parcelable requires writeToParcel
and describeContents.

Bug: 139268426
Bug: 135998869
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I7acf000c468788c3fdcb47f8601762e7804ab940
parent a241a15c

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }







































core/java/android/net/IpConfiguration.java



+2
−8




























Original line number
Original line
Diff line number
Diff line








@@ -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());