summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Reduce ConnectivityService loggingRobert Greenwalt2011-08-021-36/+39
* | | | Fix networktype on per process DNS settingrepo sync2011-08-021-1/+1
|/ / /
* | | am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." ...Robert Greenwalt2011-07-291-1/+1
|\| |
| * | am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycom...Robert Greenwalt2011-07-291-1/+1
| |\|
| | * Fix NPE when going from proxy to no proxy.Robert Greenwalt2011-07-291-1/+1
* | | resolved conflicts for merge of af75fdb1 to masterRobert Greenwalt2011-07-271-7/+1
|\| |
| * | resolved conflicts for merge of 41394a36 to honeycomb-plus-aospRobert Greenwalt2011-07-271-5/+6
| |\|
* | | resolved conflicts for merge of 41394a36 to honeycomb-plus-aospRobert Greenwalt2011-07-261-0/+6
|\ \ \ | | |/ | |/|
| * | Merge "Use dns proxy a bit." into honeycomb-LTERobert Greenwalt2011-07-261-0/+11
| |\ \
| | * | Use dns proxy a bit.Robert Greenwalt2011-07-251-0/+11
* | | | resolved conflicts for merge of a7f68230 to masterRobert Greenwalt2011-07-251-3/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | resolved conflicts for merge of 26ecc31f to honeycomb-plus-aospRobert Greenwalt2011-07-251-0/+10
| |\ \ \
| | * | | First pass tying into per-interface DNS cacheRobert Greenwalt2011-07-201-0/+16
| | * | | am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" in...Simon Wilson2011-04-041-0/+19
| | |\ \ \
| | | * | | DO NOT MERGE Disable WiMAX when "Data Enabled" is offTK MUN2011-03-301-0/+19
* | | | | | Merge "Fix USB tethering"Mike Lockwood2011-07-231-0/+9
|\ \ \ \ \ \
| * | | | | | Fix USB tetheringMike Lockwood2011-07-231-0/+9
* | | | | | | am 19933916: am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
| | | |_|/ | | |/| |
* | | | | Merge "ConnectivityService: Implement VPN callbacks to update DNS servers."Chia-chi Yeh2011-07-201-36/+113
|\ \ \ \ \
| * | | | | ConnectivityService: Implement VPN callbacks to update DNS servers.Chia-chi Yeh2011-07-191-36/+113
* | | | | | Merge "Start default connections on startup."Robert Greenwalt2011-07-201-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Start default connections on startup.Robert Greenwalt2011-07-151-0/+1
* | | | | | am 57aebc61: am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService"...Wink Saville2011-07-191-15/+37
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeyco...Wink Saville2011-07-191-15/+37
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix FeatureUser leak in ConnectivityServiceKazuhiro Ondo2011-07-191-15/+37
* | | | | | am e1635197: am 476f5525: Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
|\| | | | | | |_|/ / / |/| | | |
| * | | | am 476f5525: Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
| |\| | |
| | * | | Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
* | | | | resolved conflicts for merge of 8550f3b8 to masterRobert Greenwalt2011-07-151-177/+133
|\| | | |
| * | | | resolved conflicts for merge of 0a46db5d to honeycomb-plus-aospRobert Greenwalt2011-07-151-177/+133
| |\| | |
| | * | | Apply the dns and route diff which we get a changeRobert Greenwalt2011-07-141-164/+133
* | | | | VPN: close the socket in protectVpn() to avoid leaking descriptors.Chia-chi Yeh2011-07-141-15/+17
* | | | | Fix build.Wink Saville2011-07-141-0/+2
* | | | | am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff w...Wink Saville2011-07-141-5/+54
|\| | | |
| * | | | am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible....Wink Saville2011-07-131-5/+54
| |\| | |
| | * | | Remove STOPSHIP but allow seamless Handoff when possible.Wink Saville2011-07-131-5/+54
* | | | | resolved conflicts for merge of e4a56a32 to masterWink Saville2011-07-081-2/+4
|\| | | |
| * | | | am 8171e6f6: Use resetConnections with resetMask.Wink Saville2011-07-081-2/+4
| |\| | |
| | * | | Use resetConnections with resetMask.Wink Saville2011-07-071-2/+4
* | | | | VPN: implement status report for legacy VPN.Chia-chi Yeh2011-07-041-9/+23
* | | | | VPN: convert prepare() into a form which helps solve race conditions.Chia-chi Yeh2011-07-031-2/+2
* | | | | VPN: remove the old VpnService.Chia-chi Yeh2011-07-021-4/+0
* | | | | VPN: export legacy VPN in IConnectivityManager.Chia-chi Yeh2011-07-021-0/+9
* | | | | VPN: Use List<String> instead for dnsServers and searchDomains.Chia-chi Yeh2011-07-011-1/+1
* | | | | am 7eff4bb3: am f49e4d3f: Merge "Temporary re-enabling iface name change hand...Wink Saville2011-06-271-1/+14
|\| | | |
| * | | | am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" i...Wink Saville2011-06-231-1/+14
| |\| | |
| | * | | Temporary re-enabling iface name change handling on HOKazuhiro Ondo2011-06-231-1/+14
* | | | | Merge "WifiWatchdogService - disable bad connections"Irfan Sheriff2011-06-251-6/+0
|\ \ \ \ \