| 514c5ef8d5774d8820ed1bf90fe53af1606cf106 |
|
25-May-2016 |
Aurimas Liutikas <aurimas@google.com> |
Add missing @Deprecated annotations.
Add missing @Deprecated annotations for methods with @deprecated tag
in javadoc.
Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
/frameworks/base/core/java/android/net/Proxy.java
|
| 57bf2a8a38e929f00f3323cf97a8ea7a9af900ce |
|
11-Apr-2015 |
Prerepa Viswanadham <dham@google.com> |
Merge commit 'e593d0a' into merge_work
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
|
| ad8234213d24975ce8262b810d93af77a231bb5e |
|
11-Mar-2015 |
Paul Jensen <pauljensen@google.com> |
Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().
1. Unhide ConnectivityManager.getDefaultProxy() and update it to
take into account process-bound-Networks.
2. Deprecate EXTRA_PROXY_INFO and instead encourage querying via
getDefaultProxy().
Bug: 17905627
Bug: 17420465
Bug: 18144582
Change-Id: I45358ee82fe705d048022c8238b2452f52c37b88
/frameworks/base/core/java/android/net/Proxy.java
|
| f2459e2e1688aae285346f2638d49e1b8e230229 |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."
* commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1':
Add java.util.List import.
|
| 10ac55ba4f0beed608b310c473bb052cbcdf19c1 |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
am 5f8099ed: Merge "Add java.util.List import."
* commit '5f8099ed181c2ba279c4a747096442389d5f8840':
Add java.util.List import.
|
| 2b4378fef8906b385ee173ebdff9a91d205c7c36 |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
Add java.util.List import.
Unused on master but used downstream.
Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
/frameworks/base/core/java/android/net/Proxy.java
|
| cd4910ef606e1fa8c974c348174ee55a65541cb6 |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
* commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3':
Revert "Revert "Remove unused apache related API.""
|
| 2e1bd46a1567fa987df04dd8eef66e91b50ef4f3 |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
Revert "Revert "Remove unused apache related API.""
|
| 4b8f1846caa147cb6da6c8c024dfd17e2916d26d |
|
03-Nov-2014 |
Narayan Kamath <narayan@google.com> |
Revert "Revert "Remove unused apache related API.""
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.
Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
/frameworks/base/core/java/android/net/Proxy.java
|
| 78b3f5ab70300548776e3b98ee6d8fb6b1f5318f |
|
29-Oct-2014 |
Narayan Kamath <narayan@google.com> |
am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f':
Revert "Remove unused apache related API."
|
| b5ce284aa8e738de051572ab37a01d52fa7b1dac |
|
29-Oct-2014 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aosp
Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
|
| fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f |
|
29-Oct-2014 |
Narayan Kamath <narayan@google.com> |
am e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
Revert "Remove unused apache related API."
|
| d3389e2f32478bba4eddff3b7b63e07b74008ea7 |
|
29-Oct-2014 |
Narayan Kamath <narayan@google.com> |
resolved conflicts for merge of 9834af9c to stage-aosp-master
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
|
| 31f54ef8150019e4a8c501181806199ef7699fea |
|
27-Oct-2014 |
Narayan Kamath <narayan@google.com> |
Revert "Remove unused apache related API."
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.
Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
/frameworks/base/core/java/android/net/Proxy.java
|
| 3f2714e18bfd979aefefa1d45c50a69fca21cf14 |
|
24-Oct-2014 |
Narayan Kamath <narayan@google.com> |
Remove unused apache related API.
Hidden and used only in unit tests.
Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
/frameworks/base/core/java/android/net/Proxy.java
|
| 823675fdbb7f974b8e2fa9fbb71774b32487582d |
|
23-Oct-2014 |
Narayan Kamath <narayan@google.com> |
Deprecate more apache-http.
bug: 18067888
Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
/frameworks/base/core/java/android/net/Proxy.java
|
| 83520b95124e0fcaaf3154a7a267f6be0205bc74 |
|
09-May-2014 |
Jason Monk <jmonk@google.com> |
Switch PacUrl storage from String to Uri
Since the interface for creating/accessing PAC URLs through a
ProxyInfo is Uri based, so should the internal storage and
references.
Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
/frameworks/base/core/java/android/net/Proxy.java
|
| 5df281a570555ee132a12a4aac9aec96e8618270 |
|
09-May-2014 |
Jason Monk <jmonk@google.com> |
Fix badness from proxy refactoring.
When no PAC file getPacFileUrl() can return null now, which you
cannot call toString() on.
Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
/frameworks/base/core/java/android/net/Proxy.java
|
| 9d75ccb6a1b3b300c33ce3ceab5eaece0ad55d42 |
|
07-May-2014 |
Jason Monk <jmonk@google.com> |
Merge "Make proxy API public"
|
| 207900c23b26d0df9ab28c709db4a1007d7d7904 |
|
25-Apr-2014 |
Jason Monk <jmonk@google.com> |
Make proxy API public
Also exposed proxy-related functions that were on the
ConnectivityManager.
Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
/frameworks/base/core/java/android/net/Proxy.java
|
| 80d1f2890cf48ae95ad70f6003a7026945731225 |
|
01-May-2014 |
Jason Monk <jmonk@google.com> |
Remove unused AndroidProxySelectorRoutePlanner
Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
/frameworks/base/core/java/android/net/Proxy.java
|
| d5273da95b333b018c0d13bd6917a1e8a769f064 |
|
04-Mar-2014 |
Yuhao Zheng <yuhaozheng@google.com> |
Merge "Allow more proxy bypass patterns"
|
| 3dce5af6abc9c8d41d24d9499410b33ec76b1f08 |
|
04-Mar-2014 |
Yuhao Zheng <yuhaozheng@google.com> |
Allow more proxy bypass patterns
The current restriction on proxy bypass pattern is harsh. For instance,
"*google.com" is allowed, but "*.google.com" is not. We loosen the validity
check to allow patterns like "*.cnn.com", "*.google*.com", "10.20.*.*".
bug: 13287210
Change-Id: I7551150f785cd087c963f3a8f4c9d05f0002ff04
/frameworks/base/core/java/android/net/Proxy.java
|
| 9070484e179b2215ea595c8f3f1f69dbc0dc149d |
|
01-Mar-2014 |
Yuhao Zheng <yuhaozheng@google.com> |
Return detailed reason of invalid proxy settings
Make Proxy.validate() return valid/invalid int code, instead of throwing
exceptions. If invalid, detailed reason code is returned (currently for
Settings UI use).
bug: 13248097
Change-Id: Ic68d03f666f1cd63667afc311de7dc370d233901
/frameworks/base/core/java/android/net/Proxy.java
|
| 9ced3cd9d6ea414523051ec872fffc68f5fdbf08 |
|
12-Aug-2013 |
Jason Monk <jmonk@google.com> |
Change PacProcessor to Android Service
This switches the PacProcessor over to an Android Service. The service
is bound and unbound by the PacManager, which also adds it to the
ServiceManager, allowing for Context-Free access by the PacProxySelector
in all DVMs.
bug:10182711
Change-Id: Id1ff7660be56e8976cdcccd76e041feb47a17a61
/frameworks/base/core/java/android/net/Proxy.java
|
| 602b232a06ede86999aa362a12eb28cbc782dc1d |
|
03-Jul-2013 |
Jason Monk <jmonk@google.com> |
Add PAC File support for proxy configuration
PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host). It gets called to determine what proxy should be
used for a specific request.
This adds PAC support to the system. The ProxyProperties has been modified
to hold the PAC file when one is present. The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required. This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.
The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.
The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files. The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.
As a fallback to applications that don't use the java ProxySelector, the proxy
is setup to point to a local proxy server that will handle the pac parsing.
bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
/frameworks/base/core/java/android/net/Proxy.java
|
| e590373ea71251cfffc8f22f011e2e6335dce716 |
|
23-Feb-2011 |
Robert Greenwalt <rgreenwalt@google.com> |
Start using NetworkUtils.numericToInetAddress.
Generates InetAddresses without risking an accidental dns lookup. For use with supposedly
numeric-only ip address strings.
Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
/frameworks/base/core/java/android/net/Proxy.java
|
| 55985bed7be8c93296eee3f4f39557fba4fbaebe |
|
24-Dec-2010 |
Robert Greenwalt <rgreenwalt@google.com> |
Make sure the ProxyProperties is always present.
Lets people know that it's non-null, though the InetAddr inside may be.
bug:3305689
Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
/frameworks/base/core/java/android/net/Proxy.java
|
| 778c0ba8586a4494ed617c2d3cb3692311df1086 |
|
14-Dec-2010 |
Robert Greenwalt <rgreenwalt@google.com> |
Fix some older (depricated) API so they work.
Just because they're depricated doesn't mean we can neglect them.
Change-Id: I7556456bd8be2ec57b81b092f75b4b613b538d46
/frameworks/base/core/java/android/net/Proxy.java
|
| 434203a277cd2f237a71508a3d5a7d1602126cd5 |
|
12-Oct-2010 |
Robert Greenwalt <rgreenwalt@google.com> |
Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
/frameworks/base/core/java/android/net/Proxy.java
|
| 6b7af6055f25022361beb2c169d2c1835922dc32 |
|
05-Nov-2010 |
Elliott Hughes <enh@google.com> |
Use InetAddress.isNumeric.
This code is trying to detect anything equivalent to localhost, but without
accidentally causing a DNS lookup.
Bug: 3073384
Change-Id: Ib611c8ca46059e00b07fc4b94d4af777217da1fb
/frameworks/base/core/java/android/net/Proxy.java
|
| f21b4cde1865747ed054111944e6b30e38109293 |
|
11-Oct-2010 |
Brad Fitzpatrick <bradfitz@android.com> |
resolved conflicts for merge of b3ffd4ad to master
Change-Id: I80b227b678ef168a45494acf879debed5861de39
|
| e6b29898b12a3547c24d23e41438bcefd49b56e9 |
|
30-Sep-2010 |
Andreas Sandblad <andreas.sandblad@sonyericsson.com> |
Don't perform DNS lookup in android.net.Proxy.isLocalHost
This fixes degrade introduced by:
Switch to using public APIs instead of private ones.
536ff5a6d700a80dbd75adb737ec4b560fbed2dc
Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955
/frameworks/base/core/java/android/net/Proxy.java
|
| d192dad69e9e5a820c5c11d8cd34460c9cc2ed11 |
|
14-Sep-2010 |
Robert Greenwalt <rgreenwalt@google.com> |
Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.
bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
/frameworks/base/core/java/android/net/Proxy.java
|
| 70af574b3d61605e311a7b3b5cb1531d5201dc5b |
|
03-Sep-2010 |
Robert Greenwalt <rgreenwalt@google.com> |
Some cleanup of Proxy class.
Switch to using InetSocketAddress.
Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
/frameworks/base/core/java/android/net/Proxy.java
|
| 6f71b42bc4531618e2b050bdf9ad05a72ac2a565 |
|
05-Aug-2010 |
Oscar Montemayor <oam@google.com> |
Fix for bug 2890320 Browser crashes, after adding bookmark.
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.
Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
/frameworks/base/core/java/android/net/Proxy.java
|
| b8f66019ad2d3885be38d8874ded0e21970af998 |
|
04-Aug-2010 |
Oscar Montemayor <oam@google.com> |
Fix for bug 2890320 Browser crashes, after adding bookmark.
Fixed Proxy class locking and dealing with empty exclusion lists.
Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
/frameworks/base/core/java/android/net/Proxy.java
|
| 16fb7910fd3a86780edf4e65b529542ae95c26cd |
|
02-Aug-2010 |
Oscar Montemayor <oam@google.com> |
Global Proxy changes to proxy class.
Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
/frameworks/base/core/java/android/net/Proxy.java
|
| 536ff5a6d700a80dbd75adb737ec4b560fbed2dc |
|
17-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Fix build.
Switch to using public APIs instead of private ones.
Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
/frameworks/base/core/java/android/net/Proxy.java
|
| cc0aad38f0e9a9096f0acb71dfd1f6a8ebc7d344 |
|
17-Jul-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Fix build.
Switch to using public APIs instead of private ones.
Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
/frameworks/base/core/java/android/net/Proxy.java
|
| 2986f858ae6c6cc8a84614083661d1a2e2108aee |
|
16-Jun-2010 |
Andreas Sandblad <andreas.sandblad@sonyericsson.com> |
Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.
Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
/frameworks/base/core/java/android/net/Proxy.java
|
| fb8390729192860066c081b11b2f58db4cba9924 |
|
10-Apr-2009 |
Dave Bort <dbort@android.com> |
Remove references to android.util.Config
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=1780938
/frameworks/base/core/java/android/net/Proxy.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/net/Proxy.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/java/android/net/Proxy.java
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/java/android/net/Proxy.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/java/android/net/Proxy.java
|