Merge "Proxy fixes from API review feedback" into lmp-dev
diff --git a/api/current.txt b/api/current.txt
index 98c514e..55a3efa 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17306,6 +17306,7 @@
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 {
diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index 7ea6bae..1534e2c 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -334,10 +334,6 @@
dest.writeStringArray(mParsedExclusionList);
}
- /**
- * Implement the Parcelable interface.
- * @hide
- */
public static final Creator<ProxyInfo> CREATOR =
new Creator<ProxyInfo>() {
public ProxyInfo createFromParcel(Parcel in) {