summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/Proxy.java
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-8/+8
|\
| * Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().Paul Jensen2015-04-031-8/+8
* | am 10ac55ba: am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
|\ \
| * \ am 5f8099ed: Merge "Add java.util.List import."Narayan Kamath2014-11-031-0/+1
| |\ \
| | * | Add java.util.List import.Narayan Kamath2014-11-031-0/+1
* | | | am 2e1bd46a: am ef5d43a7: Merge "Revert "Revert "Remove unused apache related...Narayan Kamath2014-11-031-77/+0
|\ \ \ \ | |/ / /
| * | | am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""Narayan Kamath2014-11-031-77/+0
| |\ \ \ | | |/ /
| | * | Revert "Revert "Remove unused apache related API.""Narayan Kamath2014-11-031-77/+0
* | | | am fa945c10: am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
|\ \ \ \ | |/ / /
| * | | am e87d36f8: Merge "Revert "Remove unused apache related API.""Narayan Kamath2014-10-291-0/+77
| |\ \ \ | | |/ /
| | * | Revert "Remove unused apache related API."Narayan Kamath2014-10-271-0/+77
* | | | resolved conflicts for merge of d3389e2f to lmp-mr1-dev-plus-aospElliott Hughes2014-10-291-30/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | resolved conflicts for merge of 9834af9c to stage-aosp-masterNarayan Kamath2014-10-291-35/+0
| |\ \ | | |/
| | * Remove unused apache related API.Narayan Kamath2014-10-241-77/+0
* | | Deprecate more apache-http.Narayan Kamath2014-10-231-7/+1
|/ /
* | Switch PacUrl storage from String to UriJason Monk2014-05-121-6/+4
* | Fix badness from proxy refactoring.Jason Monk2014-05-091-1/+3
* | Merge "Make proxy API public"Jason Monk2014-05-071-20/+14
|\ \
| * | Make proxy API publicJason Monk2014-05-071-20/+14
* | | Remove unused AndroidProxySelectorRoutePlannerJason Monk2014-05-011-42/+0
|/ /
* | Merge "Allow more proxy bypass patterns"Yuhao Zheng2014-03-041-2/+4
|\ \
| * | Allow more proxy bypass patternsYuhao Zheng2014-03-031-2/+4
| |/
* | Return detailed reason of invalid proxy settingsYuhao Zheng2014-03-031-17/+21
|/
* Change PacProcessor to Android ServiceJason Monk2013-08-201-6/+2
* Add PAC File support for proxy configurationJason Monk2013-08-071-23/+25
* Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-021-8/+2
* Make sure the ProxyProperties is always present.Robert Greenwalt2010-12-281-1/+3
* Fix some older (depricated) API so they work.Robert Greenwalt2010-12-151-9/+20
* Notify all VMs when proxy changes.Robert Greenwalt2010-11-191-207/+79
* Use InetAddress.isNumeric.Elliott Hughes2010-11-041-6/+9
* resolved conflicts for merge of b3ffd4ad to masterBrad Fitzpatrick2010-10-111-6/+6
|\
| * Don't perform DNS lookup in android.net.Proxy.isLocalHostAndreas Sandblad2010-10-041-8/+6
| * Fix build.Jean-Baptiste Queru2010-07-161-6/+1
* | Enhance http proxy supportRobert Greenwalt2010-09-171-102/+124
* | Some cleanup of Proxy class.Robert Greenwalt2010-09-031-5/+8
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-051-23/+13
* | Fix for bug 2890320 Browser crashes, after adding bookmark.Oscar Montemayor2010-08-041-18/+31
* | Global Proxy changes to proxy class.Oscar Montemayor2010-08-021-56/+310
* | Fix build.Jean-Baptiste Queru2010-07-161-6/+1
|/
* Added method getPreferredHttpHostAndreas Sandblad2010-07-141-0/+80
* Remove references to android.util.ConfigDave Bort2009-04-091-3/+6
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+120
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-120/+0
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-4/+4
* Initial ContributionThe Android Open Source Project2008-10-211-0/+120
generated by cgit v1.1 at 2025-01-10 08:03:05 +0000