diff options
| author | Jason Monk <jmonk@google.com> | 2014-09-04 19:52:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-04 19:52:03 +0000 |
| commit | 9f30ce3b82acb1f9582e49e9d87ab0d58c8f9ce4 (patch) | |
| tree | f1a26b28a6ffa34cdfbaaa8b22681305c161a489 | |
| parent | 75c6c90aa83b9e4b69bd7ec90a063590f6baa477 (diff) | |
| parent | 8236413ce0bce12b91fdf8e907f0a6163d6d83a5 (diff) | |
| download | frameworks_base-9f30ce3b82acb1f9582e49e9d87ab0d58c8f9ce4.zip frameworks_base-9f30ce3b82acb1f9582e49e9d87ab0d58c8f9ce4.tar.gz frameworks_base-9f30ce3b82acb1f9582e49e9d87ab0d58c8f9ce4.tar.bz2 | |
Merge "Proxy fixes from API review feedback" into lmp-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/ProxyInfo.java | 4 |
2 files changed, 1 insertions, 4 deletions
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 @@ 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 { 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 @@ 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) { |