summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/ConnectivityService.java
Commit message (Expand)AuthorAgeFilesLines
* Tighten condition for calling checkMobileProvisioning.Wink Saville2013-09-141-2/+5
* Merge "checkMobileProvisioning should not block." into klp-devWink Saville2013-09-131-39/+24
|\
| * checkMobileProvisioning should not block.Wink Saville2013-09-131-39/+24
* | Merge "Guarantee that PAC Local Proxy owns Port" into klp-devJason Monk2013-09-131-1/+1
|\ \ | |/ |/|
| * Guarantee that PAC Local Proxy owns PortJason Monk2013-09-131-2/+1
* | Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-111-9/+1
|\ \
| * | Request all tethering interfaces, fix corruption.Jeff Sharkey2013-09-101-9/+1
* | | Fix for the toggle airplane mode hidden APIYuhao Zheng2013-09-111-4/+4
| |/ |/|
* | Add a hidden API to toggle airplane mode.Yuhao Zheng2013-09-101-0/+15
|/
* Merge "Tighten test for warm sim and add more debug." into klp-devWink Saville2013-09-091-25/+40
|\
| * Tighten test for warm sim and add more debug.Wink Saville2013-09-061-25/+40
* | Merge "Setting MTU size for specific network." into klp-devRobert Greenwalt2013-09-061-1/+21
|\ \
| * | Setting MTU size for specific network.sy.yun2013-09-061-1/+21
| |/
* | Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-devSreeram Ramachandran2013-09-061-19/+16
|\ \ | |/ |/|
| * Minor fixes: Add a missing "break" and some cosmetic fixes.Sreeram Ramachandran2013-08-271-19/+16
* | am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.Detai...Wink Saville2013-09-061-8/+7
|\ \
| * | Do not change NetworkInfo.DetailedState.Wink Saville2013-09-051-8/+7
* | | Merge "Rename LinkInfo to LinkQualityInfo" into klp-devVinit Deshapnde2013-09-051-9/+9
|\ \ \
| * | | Rename LinkInfo to LinkQualityInfoVinit Deshapnde2013-09-041-9/+9
* | | | Merge commit '270226b0' into manualmergeWink Saville2013-08-291-100/+376
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add support for handling mobile provisioning networks.Wink Saville2013-08-291-92/+353
| * | DO NOT MERGE: MDST is not ready until connected to DcTracker.Wink Saville2013-08-161-5/+23
| * | In isMobileOk don't execute finally if mobile data is not supported.Wink Saville2013-08-151-6/+6
* | | Don't clear Global Proxy on boot.Jason Monk2013-08-271-2/+0
| |/ |/|
* | Merge "Introduce network link quality statistics" into klp-devVinit Deshapnde2013-08-221-3/+147
|\ \
| * | Introduce network link quality statisticsVinit Deshapnde2013-08-211-3/+147
* | | Modify LinkProperties address update methods.Lorenzo Colitti2013-08-201-16/+2
|/ /
* | In isMobileOk don't execute finally if mobile data is not supported.Wink Saville2013-08-131-6/+6
* | am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal i...Wink Saville2013-08-081-0/+11
|\ \ | |/
| * Merge "If in a mobile captive portal is detected enable fail fast." into jb-m...Wink Saville2013-08-081-0/+11
| |\
| | * If in a mobile captive portal is detected enable fail fast.Wink Saville2013-08-071-0/+11
* | | am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use g...Wink Saville2013-08-081-3/+6
|\ \ \ | |/ /
| * | Merge "Have CaptivePortalTracker use gservices updateable provisioning urls."...Wink Saville2013-08-081-3/+6
| |\ \
| | * | Have CaptivePortalTracker use gservices updateable provisioning urls.Wink Saville2013-08-051-3/+6
| | |/
* | | am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." ...Wink Saville2013-08-081-2/+17
|\ \ \ | |/ /
| * | Check that hipri has started.Wink Saville2013-08-071-3/+20
| |/
* | Add PAC File support for proxy configurationJason Monk2013-08-071-10/+30
* | Merge "Add accessors for all addresses and clarify compare* methods"Lorenzo Colitti2013-08-011-1/+1
|\ \
| * | Add accessors for all addresses and clarify compare* methodsLorenzo Colitti2013-08-011-1/+1
* | | Fix excessive log spew.Wink Saville2013-07-311-1/+3
|/ /
* | Add network type TYPE_MOBILE_IA.Wink Saville2013-07-291-0/+3
* | Merge "Remove unused mDnsOverridden"Geremy Condra2013-07-261-27/+5
|\ \
| * | Remove unused mDnsOverriddenChad Brubaker2013-07-231-27/+5
* | | Merge "Fix default DNS not being set on network changes"Geremy Condra2013-07-241-4/+7
|\ \ \ | |/ /
| * | Fix default DNS not being set on network changesChad Brubaker2013-07-231-4/+7
* | | Merge "Fix supplimentary network connections with VPNs"Geremy Condra2013-07-231-37/+70
|\ \ \
| * | | Fix supplimentary network connections with VPNsChad Brubaker2013-07-191-37/+70
| |/ /
* | | Merge "Support multiple Vpn ManageDialogs"Geremy Condra2013-07-231-0/+14
|\ \ \ | |/ / |/| |
| * | Support multiple Vpn ManageDialogsChad Brubaker2013-07-161-0/+14
* | | resolved conflicts for merge of f9774dc7 to masterRobert Greenwalt2013-07-191-7/+5
|\ \ \ | | |/ | |/|