summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Have CaptivePortalTracker use gservices updateable provisioning urls.Wink Saville2013-08-051-3/+6
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After detecting there is a captive portal the url used in the notification for mobile networks should be updateable via gservices. These urls will be the same as used by CheckMp and is needed for carriers that have specific provisioning urls such as AT&T and Verizon. Bug: 9622647 Change-Id: Idcf4dabc72ece1dbbe1d5e5a21e550dd06fe16c7
* | | | am 81b1fa6f: am 9b6363e5: am cbad1243: Merge "Check that hipri has started." ↵Wink Saville2013-08-081-2/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '81b1fa6fc62190d64a6b76b4a5ee7cc2bf3172ac': Check that hipri has started.
| * | | Check that hipri has started.Wink Saville2013-08-071-3/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | I needed to test the result of startUsingNetworkFeature, otherwise on mobile networks that are slow to come up, we won't detect warm SIMs after booting. Bug: 9962943 Change-Id: Ib638a4e43867ecaa85d6abff65643b77a63526b6
* | | Add PAC File support for proxy configurationJason Monk2013-08-071-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add a method to return all addresses and all LinkAddresses on all links (both base links and stacked links). We already had one for routes, but did not yet have any for addresses. 2. Rename compareRoutes to compareAllRoutes, because unlike the other compare* methods, it looks at all interfaces. Update what appears to be its only caller. 3. Update the documentation of the compare* methods to match reality (they don't return lists) and clarify whether they look at all links or only the base link. Change-Id: Ie22e6c7f163d5de8e407248b45171dc28382d2d3
* | | | Fix excessive log spew.Wink Saville2013-07-311-1/+3
|/ / / | | | | | | | | | | | | Bug: 10115060 Change-Id: I61fd83071da1224f38757b8d90f58c8d6c41d36b
* | | Add network type TYPE_MOBILE_IA.Wink Saville2013-07-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a network type for establishing connections to the apn used for the initial connection. Enable some debug for now. Bug: 8733613 Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
* | | Merge "Remove unused mDnsOverridden"Geremy Condra2013-07-261-27/+5
|\ \ \
| * | | Remove unused mDnsOverriddenChad Brubaker2013-07-231-27/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mDnsOverridden is no longer used now that VPNs do not override the default DNS settings. Change-Id: I69495b9a6de7d60628813f357d3dbdf548695ada
* | | | 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
| | | | | | | | | | | | | | | | Change-Id: I3c45404cab34c77b20dadc1d8aee127aa08fd0bd
* | | | Merge "Fix supplimentary network connections with VPNs"Geremy Condra2013-07-231-37/+70
|\ \ \ \
| * | | | Fix supplimentary network connections with VPNsChad Brubaker2013-07-191-37/+70
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Enables the use of supplimentary mobile networks like MMS, and HIPRI while VPNs are running. Change-Id: I313f57a905b4e16bd4322c68687cbff1cfbe9d3e
* | | | Merge "Support multiple Vpn ManageDialogs"Geremy Condra2013-07-231-0/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Support multiple Vpn ManageDialogsChad Brubaker2013-07-161-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move away from storing the configs in the Intent to prevent issues with PendingIntents and multiple configs. The Dialog now queries ConnectivityService for the configuration to display in the management dialog. Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff
* | | | resolved conflicts for merge of f9774dc7 to masterRobert Greenwalt2013-07-191-7/+5
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ia9509ab6897e27da8bf4fc61a4140f2f93acb80f
| * | | Make CS.isTetheringSupported dynamicRobert Greenwalt2013-07-181-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be set at boot, but that was too quick to pick up carrier specific resources. With this change even if you switch sims subequent checks get the new values. bug:9865616 Change-Id: I8c270c6b02fc6bdd3c3d76ceea58172df25e058d
* | | | resolved conflicts for merge of 85b5e4c4 to masterRobert Greenwalt2013-07-191-8/+120
|\| | | | | | | | | | | | | | | Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3
| * | | Merge "Add gservices updater for carrier provisioning url" into jb-mr2-devRobert Greenwalt2013-07-171-7/+119
| |\ \ \
| | * | | Add gservices updater for carrier provisioning urlRobert Greenwalt2013-07-171-7/+119
| | | |/ | | |/| | | | | | | | | | | | | bug:9623159 Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
* | | | am b96cca27: am df43ba82: am e3badc10: Merge "When a SIM is changed check ↵Wink Saville2013-07-191-0/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | mobile provisioning." into jb-mr2-dev * commit 'b96cca27ba15121aab2c481786a292880c007bb6': When a SIM is changed check mobile provisioning.
| * | | When a SIM is changed check mobile provisioning.Wink Saville2013-07-161-0/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple mechanism for doing this is to take advantage of the fact that we require the device to reboot after a sim has been changed. Thus when connectivity service is started we wait to get a connection then call checkMobileProvisioning once. We also add a check that the DEVICE_PROVISIONED is true, i.e. SetupWizard has been run. Bug: 9784024 Change-Id: I5c1936744f6fc55a447ae44cd36eec3849d27e21
* | / checkMobileProvisioning is not using sendNotification.Wink Saville2013-07-191-1/+5
| |/ |/| | | | | Change-Id: Ie5b98b462b29fe9339fcb8207d2d33e3028a155c
* | Support routing sockets as another userChad Brubaker2013-07-151-0/+27
| | | | | | | | | | | | | | Add support for routing sockets as if they were another user's. This is for services that handle delegated network tasks like MediaServer and DownloadManager. Change-Id: Id20efc1f5c2cce6f8838d777762f6c0a703a9437
* | Add per user VPN supportChad Brubaker2013-07-121-14/+144
| | | | | | | | | | | | | | VPNs are now per user instead of global. A VPN set by user A routes only user A's traffic and no other user can access it. Change-Id: Ia66463637b6bd088b05768076a1db897fe95c46c
* | am 97b077bc: am 42a85412: am 925ec03f: Merge "VZW wants the phoneNumber to ↵Wink Saville2013-07-121-4/+7
|\| | | | | | | | | | | | | be 10 zero\'s if there isn\'t one." into jb-mr2-dev * commit '97b077bc18752e7dafe041cb04c19e67ce69939c': VZW wants the phoneNumber to be 10 zero's if there isn't one.
| * VZW wants the phoneNumber to be 10 zero's if there isn't one.Wink Saville2013-07-101-4/+7
| | | | | | | | | | Bug: 9784059 Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
* | am c880ae16: am db011499: am 753d754c: Merge "Fix NPE if mobile is not ↵Wink Saville2013-07-021-0/+10
|\| | | | | | | | | | | | | supported in checkMobileProvisioning." into jb-mr2-dev * commit 'c880ae16528aa90853952397b8e4d4a299d29c28': Fix NPE if mobile is not supported in checkMobileProvisioning.
| * Fix NPE if mobile is not supported in checkMobileProvisioning.Wink Saville2013-07-021-0/+10
| | | | | | | | | | Bug: 9664438 Change-Id: If0c4938956a80e8d6a21a968aa771d0d8f546b3c
* | Merge commit '3b5d686e' into fix-merge-conflictWink Saville2013-07-011-3/+508
|\| | | | | | | | | | | | | | | | | | | * commit '3b5d686e': Add checkMobileProvisioning to ConnectivityService. Conflicts: services/java/com/android/server/ConnectivityService.java Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458
| * Add checkMobileProvisioning to ConnectivityService.Wink Saville2013-06-291-3/+509
| | | | | | | | | | Bug: 9279964 Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
* | Move battery stats call from SystemUI to system server.John Spurlock2013-06-251-0/+6
| | | | | | | | | | | | The UPDATE_DEVICE_STATS permission is no longer required in sysui. Change-Id: Icc3120b7873563e3727e56bed9f3b4767da0606d
* | Fix parsing of global:http_proxy value.Andreas Huber2013-05-281-0/+6
|/ | | | | | | This caused a runtime restart for ':' and did not disable the proxy for "" before. Change-Id: Ib88b21e9eba5818a4968ae604abad8a3b3d1766f
* Use the old interface when resetting connectionsRobert Greenwalt2013-05-231-3/+4
| | | | | | | | | | The new one is often null when disconnected, so using the new fails. In other situations, it's the connections on the old network we want to reset anyway, so the old code when it would work would also do the wrong thing (unless new iface == old iface). bug:9112928 Change-Id: I1fcae89cc3aa9d712e516e7c97cece0b89869bd9
* Merge "Support WiFi only device at runtime." into jb-mr2-devWink Saville2013-04-241-0/+8
|\
| * Support WiFi only device at runtime.Wink Saville2013-04-231-0/+8
| | | | | | | | | | | | | | | | | | | | To date WiFi only devices were defined by the list of networkAttributes in config.xml overriden in on a per-device basis. This change is the simplest change needed to determine this at runtime and therefore allowing a single build to support the two different configurations. Bug: 8562845 Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
* | Listen for network disconnect.Robert Greenwalt2013-04-221-1/+16
|/ | | | | | | | | | | | | | VPN used to just watch the interface, but that is insufficient. There is no promise that the interface will go down when we're done with it. Now that wifi stays on in scan-only mode despite user turning it off it seems that the interface is left up, even in AP mode. Now listening for ConnectivityService broadcast that the network we were on has disconnected and tearing down the VPN then or when the interface goes away. bug:8550083 Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a
* Add new route.hasGateway() apiRobert Greenwalt2013-04-121-2/+1
| | | | | | | | | Fixes issues brought in by change to isHostRoute. isHostRoute was technically correct, but the callers really wanted hasNextHop behavior. bug:8597268 Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f
* Merge "Routing workaround." into jb-mr2-devRobert Greenwalt2013-04-111-22/+23
|\
| * Routing workaround.Robert Greenwalt2013-04-091-22/+23
| | | | | | | | | | | | | | | | Change our order of operations so that secondary route table adds succeed. Working to understand the why of this too. bug:8361314 Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d
* | Use CONNECTIVITY_INTERNAL for global proxyRobert Greenwalt2013-04-101-5/+10
| | | | | | | | | | | | | | | | | | The Global http proxy shouldn't be used by apps, but can be useful in certain conditions. bug:8264794 bug:8557674 Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a
* | Turn back on global proxy support.Robert Greenwalt2013-04-081-15/+16
|/ | | | | | | This reverts 138626. Bug:8557674 Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0
* Merge "Stop clat if it's no longer in use." into jb-mr2-devLorenzo Colitti2013-03-291-1/+9
|\
| * Stop clat if it's no longer in use.Lorenzo Colitti2013-03-281-1/+9
| | | | | | | | | | | | | | | | | | | | Normally, clatd is stopped when a connection disconnects. However, if the connection's LinkProperties change, or if the disconnect somehow gets lost (e.g., because of bug 8486114), then we need to stop it (and possibly restart it). Bug: 8276725 Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc
* | Add BT - DataTracker connectionRobert Greenwalt2013-03-271-1/+10
|/ | | | | | | | Allows the external BT stack the means to communicate with ConnectivityService during reverse tethering. bug:8445208 Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
* Reset connections on all stacked interfaces.Lorenzo Colitti2013-03-201-19/+20
| | | | | Bug: 8276725 Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea
* Merge "Framework changes for 464xlat." into jb-mr2-devLorenzo Colitti2013-03-181-0/+17
|\
| * Framework changes for 464xlat.Lorenzo Colitti2013-03-151-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add a Nat464Xlat service that ConnectivityService can use to start and stop clat. When clat is started, the service waits for the clat interface to come up and then calls ConnectivityService to add the appropriate routes. 2. Make ConnectivityService start clat when an IPv6-only mobile interface is connected. We only support clat on mobile for now. 3. Make tethering use the interface that has the IPv4 default route insted of using the base interface of the LinkProperties. This allows us to tether to a stacked interface, which is needed for tethering with 464xlat. Bug: 8276725 Change-Id: I24480af69ee280f504399062638af0836a56268e
* | Merge "Set routes from stacked links as well." into jb-mr2-devLorenzo Colitti2013-03-151-8/+13
|\|