summaryrefslogtreecommitdiff
path: root/core/java/android/net/Proxy.java
Commit message (Collapse)AuthorAgeFilesLines
* Remove EXTRA_PROXY_INFO.Lorenzo Colitti2021-04-271-0/+1
| | | | | | | | | This has been deprecated since M because it very error-prone, and there are documented replacements. Test: m Bug: 171872228 Change-Id: Ide9846a26fc440b3ec5b4e4b444a046e738de3d6
* Move Proxy, PacProxySelector out of ConnectivityRemi NGUYEN VAN2021-03-011-0/+248
| | | | | | | | | | | PacProxySelector is tied to IProxyService, which does not have a formal API. Proxy is the interface with ConnectivityService, and all its methods are public or module API. Bug: 171540887 Test: m Change-Id: I8ceba961a81661c3e11d8179955b594d3cab6ff7
* Move module sources to packages/ConnectivityRemi NGUYEN VAN2021-02-011-294/+0
| | | | | | | | | | | | | | Files that are planned to be part of the connectivity module are grouped in packages/Connectivity, so they can be built separately and moved in one operation with their history into packages/modules/Connectivity. This places the files in the existing framework-connectivity-sources filegroup instead of the current framework-core-sources filegroup. Both are used the same way in framework-non-updatable-sources. Bug: 171540887 Test: m Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e
* [Mainline] Migrate ProxyInfoSerik Beketayev2020-12-231-1/+3
| | | | | | Bug: 173455434 Test: atest FrameworksNetTests Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
* [Mainline Migration] Migrate NetworkUtilsSerik Beketayev2020-12-061-1/+1
| | | | | | | | Migrating makeStrings(), numericToInetAddress() APIs Bug: 173089079 Test: atest FrameworksNetTests Change-Id: Ie914fd41bc3ce16d07f5d2768b89ce805b9245a9
* Add maxTargetSdk restriction to unused APIs.Mathew Inwood2020-11-041-1/+2
| | | | | | | | | | | These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. Bug: 170729553 Test: Treehugger Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
* Use new UnsupportedAppUsage annotation.Artur Satayev2020-01-081-1/+1
| | | | | | | | | Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I0c336de56bc4a041dc97ff9b7927f62f0b44b457 Merged-In: I0c336de56bc4a041dc97ff9b7927f62f0b44b457
* Add @UnsupportedAppUsage annotationsMathew Inwood2018-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For packages: android.net.wimax android.net.wifi.p2p.nsd android.net.wifi.p2p android.net.wifi.hotspot2.pps android.net.wifi.hotspot2.omadm android.net.wifi.hotspot2 android.net.wifi.aware android.net.wifi android.net.util android.net.sip android.net.rtp android.net.nsd android.net.metrics android.net.lowpan android.net.http android.net.captiveportal android.net This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Change-Id: Ie25423113ee1a8071cd5039382c00de6ce0af7fd Merged-In: I520be7a4c79e68310c12e4f55bf66acaa94145a1
* Add missing @Deprecated annotations.Aurimas Liutikas2016-05-241-0/+5
| | | | | | | Add missing @Deprecated annotations for methods with @deprecated tag in javadoc. Change-Id: I35b78ccb97832d86b914c21a300444ba29e33844
* Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-8/+8
|\ | | | | | | Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
| * Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().Paul Jensen2015-04-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
|\ \ | | | | | | | | | | | | * commit '10ac55ba4f0beed608b310c473bb052cbcdf19c1': Add java.util.List import.
| * \ am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '5f8099ed181c2ba279c4a747096442389d5f8840': Add java.util.List import.
| | * | Add java.util.List import.Narayan Kamath2014-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Unused on master but used downstream. Change-Id: I7c072e25d1f7c3a645efb2986d23e81068dced22
* | | | am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache ↵Narayan Kamath2014-11-031-77/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | related API.""" * commit '2e1bd46a1567fa987df04dd8eef66e91b50ef4f3': Revert "Revert "Remove unused apache related API.""
| * | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-77/+0
| |\| | | | | | | | | | | | | | | | | | * commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735': Revert "Revert "Remove unused apache related API.""
| | * | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-77/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea. Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
* | | | am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
|\| | | | | | | | | | | | | | | | | | | * commit 'fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f': Revert "Remove unused apache related API."
| * | | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
| |\| | | | | | | | | | | | | | | | | | * commit 'e87d36f8925a34f85ba80c886757d07ad03fed42': Revert "Remove unused apache related API."
| | * | Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14. Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
* | | | resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aospElliott Hughes2014-10-291-30/+0
|\| | | | |_|/ |/| | | | | Change-Id: Ic4969a59ef22d4911f74cc1e75ea5ccfab59b770
| * | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-35/+0
| |\| | | | | | | | | | Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
| | * Remove unused apache related API.Narayan Kamath2014-10-241-77/+0
| | | | | | | | | | | | | | | | | | Hidden and used only in unit tests. Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
* | | Deprecate more apache-http.Narayan Kamath2014-10-231-7/+1
|/ / | | | | | | | | | | bug: 18067888 Change-Id: I50511d53dfc9ae236dfb1646c55a5dd7fa15d7b2
* | Switch PacUrl storage from String to UriJason Monk2014-05-121-6/+4
| | | | | | | | | | | | | | | | Since the interface for creating/accessing PAC URLs through a ProxyInfo is Uri based, so should the internal storage and references. Change-Id: Ibf15c350f4cc526f81aba3ec463070f26af8f535
* | Fix badness from proxy refactoring.Jason Monk2014-05-091-1/+3
| | | | | | | | | | | | | | When no PAC file getPacFileUrl() can return null now, which you cannot call toString() on. Change-Id: Ife00f641c2c17fbc1bde17017d9af59d23cb9182
* | Merge "Make proxy API public"Jason Monk2014-05-071-20/+14
|\ \
| * | Make proxy API publicJason Monk2014-05-071-20/+14
| | | | | | | | | | | | | | | | | | | | | Also exposed proxy-related functions that were on the ConnectivityManager. Change-Id: I9fb5f1bcc257a6198679ea1d56e18da2ec5a3b33
* | | Remove unused AndroidProxySelectorRoutePlannerJason Monk2014-05-011-42/+0
|/ / | | | | | | Change-Id: Ib970e1d78c3f990fcf24b953f442dcaa94b68903
* | Merge "Allow more proxy bypass patterns"Yuhao Zheng2014-03-041-2/+4
|\ \
| * | Allow more proxy bypass patternsYuhao Zheng2014-03-031-2/+4
| |/ | | | | | | | | | | | | | | | | 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
* / Return detailed reason of invalid proxy settingsYuhao Zheng2014-03-031-17/+21
|/ | | | | | | | | 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
* Change PacProcessor to Android ServiceJason Monk2013-08-201-6/+2
| | | | | | | | | | 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
* Add PAC File support for proxy configurationJason Monk2013-08-071-23/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-021-8/+2
| | | | | | | Generates InetAddresses without risking an accidental dns lookup. For use with supposedly numeric-only ip address strings. Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
* Make sure the ProxyProperties is always present.Robert Greenwalt2010-12-281-1/+3
| | | | | | | Lets people know that it's non-null, though the InetAddr inside may be. bug:3305689 Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
* Fix some older (depricated) API so they work.Robert Greenwalt2010-12-151-9/+20
| | | | | | Just because they're depricated doesn't mean we can neglect them. Change-Id: I7556456bd8be2ec57b81b092f75b4b613b538d46
* Notify all VMs when proxy changes.Robert Greenwalt2010-11-191-207/+79
| | | | | bug:2700664 Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
* Use InetAddress.isNumeric.Elliott Hughes2010-11-041-6/+9
| | | | | | | | This code is trying to detect anything equivalent to localhost, but without accidentally causing a DNS lookup. Bug: 3073384 Change-Id: Ib611c8ca46059e00b07fc4b94d4af777217da1fb
* resolved conflicts for merge of b3ffd4ad to masterBrad Fitzpatrick2010-10-111-6/+6
|\ | | | | | | Change-Id: I80b227b678ef168a45494acf879debed5861de39
| * Don't perform DNS lookup in android.net.Proxy.isLocalHostAndreas Sandblad2010-10-041-8/+6
| | | | | | | | | | | | | | | | This fixes degrade introduced by: Switch to using public APIs instead of private ones. 536ff5a6d700a80dbd75adb737ec4b560fbed2dc Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955
| * Fix build.Jean-Baptiste Queru2010-07-161-6/+1
| | | | | | | | | | | | Switch to using public APIs instead of private ones. Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
* | Enhance http proxy supportRobert Greenwalt2010-09-171-102/+124
| | | | | | | | | | | | | | | | 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
* | Some cleanup of Proxy class.Robert Greenwalt2010-09-031-5/+8
| | | | | | | | | | | | Switch to using InetSocketAddress. Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-051-23/+13
| | | | | | | | | | | | | | Simplified locking scheme in Proxy's getProxy(..) method. Also modified ContentObserver creation to be done from any thread. Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-041-18/+31
| | | | | | | | | | | | Fixed Proxy class locking and dealing with empty exclusion lists. Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
* | Global Proxy changes to proxy class.Oscar Montemayor2010-08-021-56/+310
| | | | | | | | Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
* | Fix build.Jean-Baptiste Queru2010-07-161-6/+1
|/ | | | | | Switch to using public APIs instead of private ones. Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
* Added method getPreferredHttpHostAndreas Sandblad2010-07-141-0/+80
| | | | | | | | | | | 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
* Remove references to android.util.ConfigDave Bort2009-04-091-3/+6
| | | | | | | The semantics of Config.DEBUG will be changing soon, and all other Config.* fields will become deprecated/hidden. BUG=1780938