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

Commit 9f30ce3b authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Proxy fixes from API review feedback" into lmp-dev

parents 75c6c90a 8236413c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17306,6 +17306,7 @@ package android.net { 
    method public android.net.Uri getPacFileUrl();

    method public int getPort();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator CREATOR;

  }















  public abstract class PskKeyManager {

























core/java/android/net/ProxyInfo.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -334,10 +334,6 @@ public class ProxyInfo implements Parcelable {













        dest.writeStringArray(mParsedExclusionList);















    }





























    /**













     * Implement the Parcelable interface.













     * @hide













     */















    public static final Creator<ProxyInfo> CREATOR =















        new Creator<ProxyInfo>() {















            public ProxyInfo createFromParcel(Parcel in) {