commit 8236413ce0bce12b91fdf8e907f0a6163d6d83a5
author Jason Monk <jmonk@google.com> Thu Sep 04 15:07:49 2014 -0400
committer Jason Monk <jmonk@google.com> Thu Sep 04 15:39:56 2014 -0400
tree cfd84f5b9d29bdbce5d9c1510bf87ba637bc4304
parent 6bed40eddc29c536c064c9238cfefe863c3d0db5

Proxy fixes from API review feedback

Bug: 17389383
Change-Id: Ib5e40f55d02687ee917ba30773123cf3e4c2a97d

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index a69a8e5..2e4dfb8 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 {

core/java/android/net/ProxyInfo.java

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) {