summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Reduce ConnectivityService loggingRobert Greenwalt2011-08-021-36/+39
| | | | | | | | | | | | | | | | | | | | bug:5106520 Change-Id: I4a7a5cac51c09e9e2275b30b7b2c053f94b9088d
* | | | Fix networktype on per process DNS settingrepo sync2011-08-021-1/+1
|/ / / | | | | | | | | | | | | | | | This potentially has no impact on mobile due to DNS settings being the same. Seperate this change out of the p2p change Change-Id: I70fff9b1e13015956793b19732785037adb0af24
* | | am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." ↵Robert Greenwalt2011-07-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8': Fix NPE when going from proxy to no proxy.
| * | am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into ↵Robert Greenwalt2011-07-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '1a230885b356256e91b3bf006ec72213ba6f8f76': Fix NPE when going from proxy to no proxy.
| | * Fix NPE when going from proxy to no proxy.Robert Greenwalt2011-07-291-1/+1
| | | | | | | | | | | | | | | bug:5081431 Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
* | | resolved conflicts for merge of af75fdb1 to masterRobert Greenwalt2011-07-271-7/+1
|\| | | | | | | | | | | Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129
| * | resolved conflicts for merge of 41394a36 to honeycomb-plus-aospRobert Greenwalt2011-07-271-5/+6
| |\| | | | | | | | | | Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
* | | resolved conflicts for merge of 41394a36 to honeycomb-plus-aospRobert Greenwalt2011-07-261-0/+6
|\ \ \ | | |/ | |/| | | | Change-Id: If4dc99c558dc45c9a7ff8d3ea5be69578b4ee793
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the current default interface and sets the dns per interface. port of changes 23041 and 22098 from opensource. bug:5060618 Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
* | | | resolved conflicts for merge of a7f68230 to masterRobert Greenwalt2011-07-251-3/+18
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9
| * | | resolved conflicts for merge of 26ecc31f to honeycomb-plus-aospRobert Greenwalt2011-07-251-0/+10
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
| | * | | First pass tying into per-interface DNS cacheRobert Greenwalt2011-07-201-0/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Iacce225d392786e37fa2dbf9647045fca0b70e64
| | * | | am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" ↵Simon Wilson2011-04-041-0/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'ec94472835787b66e1799110411d5077d0ef37cd': DO NOT MERGE Disable WiMAX when "Data Enabled" is off
| | | * | | DO NOT MERGE Disable WiMAX when "Data Enabled" is offTK MUN2011-03-301-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user uncheck "Data Enabled" check box, WiMAX goes into "disconnected" state. Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2 Signed-off-by: TK MUN <tk.mun@samsung.com>
* | | | | | Merge "Fix USB tethering"Mike Lockwood2011-07-231-0/+9
|\ \ \ \ \ \
| * | | | | | Fix USB tetheringMike Lockwood2011-07-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous approach no longer works with the new USB drivers, since the usb0 interface is no longer enabled by default. This introduced a chicken & egg problem - usb0 will not be enabled until the user tries to start tethering, but Settings will not enable the checkbox unless usb0 is enabled. To fix this we add an explicit call to start USB tethering in the connectivity manager. This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled. Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am 19933916: am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * commit '199339169476d0d6d0ecaa8ed3bff3a9e9a0f430': Add better routes for secondary DNS
| * | | | | am ad55d351: Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit 'ad55d35114237071133eb28ded93a014185d4e35': Add better routes for secondary DNS
| | * | | | Add better routes for secondary DNSRobert Greenwalt2011-07-221-30/+56
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes instead so the BP can do it's nonstandard "magical" demultiplexing. bug:5011392 Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7b5063f0344a2a5c2754600386982e870adc1161
* | | | | | Merge "Start default connections on startup."Robert Greenwalt2011-07-201-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Start default connections on startup.Robert Greenwalt2011-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On devices with mobile data we were kind of doing this in Telephony. Devices without could use this. bug:5030831 Change-Id: I9940561e88e43917bc8e638f5c3b15fced3821ae
* | | | | | am 57aebc61: am f679d4cb: Merge "Fix FeatureUser leak in ↵Wink Saville2011-07-191-15/+37
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectivityService" into honeycomb-LTE * commit '57aebc6109f2059ba335a02bf95928a494cff4ba': Fix FeatureUser leak in ConnectivityService
| * | | | | am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into ↵Wink Saville2011-07-191-15/+37
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43': Fix FeatureUser leak in ConnectivityService
| | * | | | Fix FeatureUser leak in ConnectivityServiceKazuhiro Ondo2011-07-191-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case infinite restoral timer is used for a network feature, FeatureUser could be keep added but never released if a user is keep calling "startUsingNetworkFeature". This patch will add duplication check when adding a FeatureUser into the list in case infinite restoral timer is used. Bug: 5043513 Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908
* | | | | | am e1635197: am 476f5525: Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | * commit 'e1635197bb6e6471b333d194855bb399da419957': Small fix to 5008973 fix.
| * | | | am 476f5525: Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b': Small fix to 5008973 fix.
| | * | | Small fix to 5008973 fix.Robert Greenwalt2011-07-151-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundent log. Cleaned some logic. Will try to modify route even if recursive operation had an error. bug: 5008973 Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da
* | | | | resolved conflicts for merge of 8550f3b8 to masterRobert Greenwalt2011-07-151-177/+133
|\| | | | | | | | | | | | | | | | | | | Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
| * | | | resolved conflicts for merge of 0a46db5d to honeycomb-plus-aospRobert Greenwalt2011-07-151-177/+133
| |\| | | | | | | | | | | | | | | | | | Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
| | * | | Apply the dns and route diff which we get a changeRobert Greenwalt2011-07-141-164/+133
| | | | | | | | | | | | | | | | | | | | | | | | | bug:5008973 Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
* | | | | VPN: close the socket in protectVpn() to avoid leaking descriptors.Chia-chi Yeh2011-07-141-15/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
* | | | | Fix build.Wink Saville2011-07-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in ConnectivityService in hc-LTE when merged with changes happening in Master caused the build to break. Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
* | | | | am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff ↵Wink Saville2011-07-141-5/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when possible." into honeycomb-LTE * commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d': Remove STOPSHIP but allow seamless Handoff when possible.
| * | | | am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when ↵Wink Saville2011-07-131-5/+54
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible." into honeycomb-LTE * commit '6d1d16c324a681dd966d47497a71a02eac512234': Remove STOPSHIP but allow seamless Handoff when possible.
| | * | | Remove STOPSHIP but allow seamless Handoff when possible.Wink Saville2011-07-131-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an address is removed we must reset the connection but only for the connections associated with that address. For now we're doing the "all" addresses for a type (IPv6 or IPv4) in the future we only need to reset a particular addresses connections. Bug: 4981919 Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
* | | | | resolved conflicts for merge of e4a56a32 to masterWink Saville2011-07-081-2/+4
|\| | | | | | | | | | | | | | | | | | | Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12
| * | | | am 8171e6f6: Use resetConnections with resetMask.Wink Saville2011-07-081-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '8171e6f690cca1bad354e7e352823d79d420daf3': Use resetConnections with resetMask.
| | * | | Use resetConnections with resetMask.Wink Saville2011-07-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4981919 Change-Id: I5dec2da0756d5083bc81494fd583672704537694
* | | | | VPN: implement status report for legacy VPN.Chia-chi Yeh2011-07-041-9/+23
| | | | | | | | | | | | | | | | | | | | Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6
* | | | | VPN: convert prepare() into a form which helps solve race conditions.Chia-chi Yeh2011-07-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone tries to revoke packageA, it is possible that packageA is already revoked by packageB. In this case packageB should not be revoked, and the new prepare() can help solve this problem. Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1
* | | | | VPN: remove the old VpnService.Chia-chi Yeh2011-07-021-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now VPN is (kind of) integrated into ConnectivityService. Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55
* | | | | VPN: export legacy VPN in IConnectivityManager.Chia-chi Yeh2011-07-021-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1
* | | | | VPN: Use List<String> instead for dnsServers and searchDomains.Chia-chi Yeh2011-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8
* | | | | am 7eff4bb3: am f49e4d3f: Merge "Temporary re-enabling iface name change ↵Wink Saville2011-06-271-1/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling on HO" into honeycomb-LTE * commit '7eff4bb3f9c0cf0335dd1b2769bcb352b137dbaa': Temporary re-enabling iface name change handling on HO
| * | | | am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" ↵Wink Saville2011-06-231-1/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-LTE * commit 'f49e4d3f182071081537dba3387db20cae27c427': Temporary re-enabling iface name change handling on HO
| | * | | Temporary re-enabling iface name change handling on HOKazuhiro Ondo2011-06-231-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary accept interface name change in ConnectivityService. See bug/4455071. Bug: 4903011 Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
* | | | | Merge "WifiWatchdogService - disable bad connections"Irfan Sheriff2011-06-251-6/+0
|\ \ \ \ \