diff options
Diffstat (limited to 'packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java')
-rw-r--r-- | packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java index 5d8689e..77f3c8c 100644 --- a/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java +++ b/packages/services/Proxy/src/com/android/proxyhandler/ProxyServer.java @@ -1,7 +1,20 @@ - +/** + * Copyright (c) 2013, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.android.proxyhandler; -import android.net.ProxyProperties; import android.util.Log; import com.google.android.collect.Lists; @@ -36,7 +49,6 @@ public class ProxyServer extends Thread { public boolean mIsRunning = false; private ServerSocket serverSocket; - private ProxyProperties mProxy; private class ProxyConnection implements Runnable { private Socket connection; @@ -48,8 +60,6 @@ public class ProxyServer extends Thread { @Override public void run() { try { - android.net.Proxy.setHttpProxySystemProperty(mProxy); - String requestLine = getLine(connection.getInputStream()); if (requestLine == null) { connection.close(); @@ -212,8 +222,4 @@ public class ProxyServer extends Thread { } } } - - public void setProxy(ProxyProperties proxy) { - mProxy = proxy; - } } |