diff options
| author | Jason Monk <jmonk@google.com> | 2013-08-28 14:41:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-28 14:41:15 +0000 |
| commit | 1f809c7761a52102621b22fe8ec8c9f91ec1fe54 (patch) | |
| tree | 9d255ce9cbdbc0c2f52f72c5af10f560885f3234 | |
| parent | d20aeab028bae53b46a707119e57a50c073337c2 (diff) | |
| parent | a8220a73c5cb1a65ca7a457f66c97e4e4c32ee4b (diff) | |
| download | frameworks_base-1f809c7761a52102621b22fe8ec8c9f91ec1fe54.zip frameworks_base-1f809c7761a52102621b22fe8ec8c9f91ec1fe54.tar.gz frameworks_base-1f809c7761a52102621b22fe8ec8c9f91ec1fe54.tar.bz2 | |
Merge "Don't clear Global Proxy on boot." into klp-dev
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index ec6b063..136a85e 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3355,8 +3355,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } ProxyProperties p = new ProxyProperties(data[0], proxyPort, ""); setGlobalProxy(p); - } else { - setGlobalProxy(null); } } |