summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | resolved conflicts for merge of ab2194aa to honeycomb-plus-aospRobert Greenwalt2011-04-041-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
| | * | | | am 27725e8c: Only leave one default network up at a time.Robert Greenwalt2011-04-041-0/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | * commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84': Only leave one default network up at a time.
| | | * | | Only leave one default network up at a time.Robert Greenwalt2011-03-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If original refuses to tear down, tear down new one. It's better to have none (which will try to launch them all again) than two. Really people shouldn't refuse the teardown request. bug:4183397 Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
| * | | | | Fix the build.Robert Greenwalt2011-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bad merge. Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
* | | | | | Fix a bad merge.Robert Greenwalt2011-04-011-12/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread after the bad merge was reverted by master change 104487 (Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4). bug:4157610 Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
* | | | | | Fix the buildMichael Jurka2011-03-301-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp" This reverts commit 352f2c33d3b8a0b73dcdab98c7a77f698578b048, reversing changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471.
* | | | | | am 047f9d12: Merge "resolved conflicts for merge of ce6766ea to ↵Robert Greenwalt2011-03-301-13/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-plus-aosp" into honeycomb-plus-aosp * commit '047f9d12976d90d0931a64a256bb4843d77f5e20': Fix some alt-network issues.
| * | | | | resolved conflicts for merge of ce6766ea to honeycomb-plus-aospRobert Greenwalt2011-03-301-13/+16
| |\| | | | | | |_|/ / | |/| | | | | | | | Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
| | * | | am 568845a7: Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-301-12/+11
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '568845a766cddc4e4c222b4d9de064f8a48da990': Fix some alt-network issues.
| | | * | Fix some alt-network issues.Robert Greenwalt2011-03-251-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two issues. 1) remove default routes for non-default networks. 2) don't report mobile is the active default network just because it is active. bug:4157610 Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f
| | * | | am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into ↵Robert Greenwalt2011-03-111-50/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8': DO NOT MERGE Backport of I1f55df8a from master.
| | | * | DO NOT MERGE Backport of I1f55df8a from master.Robert Greenwalt2011-03-101-50/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes false reporting of NO_CONNECTION. bug:4057115 Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
| | * | | am 4bdab175: DO NOT MERGE WiMAX supportTK MUN2011-03-091-5/+107
| | |\| | | | | | | | | | | | | | | | | | | | | | * commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7': DO NOT MERGE WiMAX support
| | | * | DO NOT MERGE WiMAX supportTK MUN2011-03-091-5/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In Connectivity service, start WiMAX service - 4G icon display in StatusBarPolicy - Add DHCP renew - Add radio for WiMAX Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd Signed-off-by: TK MUN <tk.mun@samsung.com>
| | * | | am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into ↵Robert Greenwalt2011-02-161-44/+17
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '3259d8853760a72b811757e1711119d041962a1c': DO NOT MERGE - backport of l92a02b31 from master
| | | * | DO NOT MERGE - backport of l92a02b31 from masterRobert Greenwalt2011-02-111-44/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix handling of multiple possible default networks. bug:3328196 Change-Id: I994f1621ff82de454192945a9cae961e1710d537
* | | | | am 5635dc93: am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." ↵Robert Greenwalt2011-03-221-8/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9': Fix adding of default route.
| * | | | am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1Robert Greenwalt2011-03-221-8/+13
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516': Fix adding of default route.
| | * | | Fix adding of default route.Robert Greenwalt2011-03-221-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you deleted the host routes (started a secondary network like mms, supl of hipri and then ended it) you would lose the host route to the default gateway. Then if you needed to re-add the default gateway route (lost the connection and removed the default route and then re-established) you couldn't - can't add a gateway that isn't routable apparently. This happens if you are in a video chat and lose your connection without losing the interface (PPP keeps it up for a bit). Fixed it by having addDefaultRoute first add a hsot route for the gateway before adding the default route. This allows the default add to succeed. bug:3490353 Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
| * | | | Do not merge: Revert the revert of "LTE Changes for Telephony including ↵Wink Saville2011-03-141-18/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple PDN support and IPV6 support" This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7 and is the first of the LTE commits in master being back ported to the LTE branch. Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
| * | | DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN ↵Wink Saville2011-03-031-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support and IPV6 support" This reverts commit 2b8bcfe5b74e1a34d136f4ff46e3c94397f38f82. Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
* | | | Add support for USB Ethernet adaptersBenoit Goby2011-03-041-0/+5
|/ / / | | | | | | | | | Change-Id: Ie75cbcdb1b0c8965b59b89675a05175a1e9ebdd6
* | | Merge "Start using NetworkUtils.numericToInetAddress."Robert Greenwalt2011-03-021-2/+2
|\ \ \
| * | | Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Generates InetAddresses without risking an accidental dns lookup. For use with supposedly numeric-only ip address strings. Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a
* | | | Merge "Fixing the write of BackgroundData setting."Robert Greenwalt2011-02-251-7/+5
|\ \ \ \
| * | | | Fixing the write of BackgroundData setting.Robert Greenwalt2011-02-251-7/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | I outsmarted myself trying to minimize writes and caused no writes to occur. bug:3485934 Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec
* / / / LTE Changes for Telephony including Multiple PDN support and IPV6 supportWink Saville2011-02-241-18/+27
|/ / / | | | | | | | | | | | | | | | Added init for CDMAPhone.java Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
* | | Update LinkProperties treatment of gatewaysRobert Greenwalt2011-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | A link can have multiple gateways (think ipv4/ipv6 for a trivial example). . bug:3438810 Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
* | | am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." ↵Wink Saville2011-01-261-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85': Comment out the isAvailable optimization.
| * | | Comment out the isAvailable optimization.Wink Saville2011-01-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the comment says this causes problems if the connection is handling errors. This removes the optimization for now. Bug: 3386481 Change-Id: I6cb00abe8b1949e9b79b4906a6bdab5872b5054d
* | | | am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into ↵Hung-ying Tyan2011-01-191-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c': Make VpnService synchronous API.
| * | | Make VpnService synchronous API.Hung-ying Tyan2011-01-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This eases VpnSettings on dealing with multiple-activity-instance problem (i.e., SettingsActivity and VpnSettingsActivity). + Most of the code is moved from the VpnServices package to vpn/java/. + VpnManager and VpnServiceBinder are revised to provide synchronous API. + Add a new method isIdle() to IVpnService.aidl. Related bug: 3293236 (need to deal with multiple-activity-instance problem) Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
* | | | am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." ↵Robert Greenwalt2011-01-131-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65': Turn off DUN connection after tethering.
| * | | Turn off DUN connection after tethering.Robert Greenwalt2011-01-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use matching feature type when turning tethering off or the request is ignored. Also, turn on DUN apn right away so that we don't fail aggressive test cases. Also don't report connections for enabled apn's that we're no longer connected to. bug:3332880 bug:3338033 Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
* | | | am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycombRobert Greenwalt2011-01-121-50/+25
|\| | | | | | | | | | | | | | | | | | | * commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa': Fix any_connection reporting.
| * | | Fix any_connection reporting.Robert Greenwalt2011-01-111-50/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change caused us to think there was no other connection available when transitioning from 3g to wifi. bug:3335074 Change-Id: I1f55df8a0eb5b27131572b111fbaac8f1ebbc0d3
* | | | am 89c8f755: Merge "Fix handling of multiple possible default networks" into ↵Robert Greenwalt2011-01-071-46/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5': Fix handling of multiple possible default networks
| * | | Fix handling of multiple possible default networksRobert Greenwalt2011-01-061-46/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code assumed only 2 choices but now we have more. bug:3328196 Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a
* | | | connectivity-change events can happen before boot completes (similar to:Stan Chesnutt2011-01-061-1/+2
|/ / / | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#change,87425 ) Change-Id: Ibc0f12defaa5d90894657ce63fb352578eca7060
* | | Allow bumpDns() to execute correctly before boot has completedStan Chesnutt2011-01-051-0/+4
| | | | | | | | | | | | Change-Id: I5c2cf023e555f49d7e29592f9d1439b3ac367e3d
* | | Always file DUN requests for tethering.Robert Greenwalt2011-01-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bit of a hack so that first trySetupData call uses the proper APN in strange edge cases. Made a new startUsingNetworkFeature string that ConnectivityService knows means always pass the request to telephony even if telephony connections are not currently available. bug:3133178 Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
* | | Cache the current value of background-data.Robert Greenwalt2010-12-291-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | The writing of the persistent setting is async, but we should still remember it so if somebody asks before the write completes we give the right answer. Makes the read faster too. bug:3312848 Change-Id: I864cb5f8d496d5bf9cbf0af9a71ca84da078f7c6
* | | Make sure the ProxyProperties is always present.Robert Greenwalt2010-12-281-0/+1
| | | | | | | | | | | | | | | | | | | | | Lets people know that it's non-null, though the InetAddr inside may be. bug:3305689 Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
* | | Reduce the spinning while tethering.Robert Greenwalt2010-12-231-10/+31
| | | | | | | | | | | | | | | | | | | | | Doing too much stuff - don't retry when we know we shouldn't. bug:3293460 Change-Id: Ic7b0b6486b39377d74df7a35572059ac60d03fa0
* | | Add TYPE_BLUETOOTH network interface for reverse tethering.Jaikumar Ganesh2010-12-221-5/+6
| | | | | | | | | | | | Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
* | | am 46f98746: am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when ↵Robert Greenwalt2010-12-221-0/+1
|\| | | | | | | | | | | | | | | | | | | | needed." into gingerbread * commit '46f987465c1df4ec984e725747d4d79fc592abb7': Be sure and report NO_CONNECTIVITY when needed.
| * | am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into ↵Robert Greenwalt2010-12-211-0/+1
| |\| | | | | | | | | | | | | | | | | | | gingerbread * commit '5d0fafe80752ad4e40fe0ec2bc06c43e669a0612': Be sure and report NO_CONNECTIVITY when needed.
| | * Be sure and report NO_CONNECTIVITY when needed.Robert Greenwalt2010-12-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reports that we sometimes didn't report NO_CONNECTIVITY led to this suggested change. Could not repro the problem, but the change looks ok anyway. Better safe than sorry. bug:3276408 Change-Id: I0cdb48a05a5c9dfcf3a0b468a6eae43d461023b1
* | | Correct an error code to pass CTS.Robert Greenwalt2010-12-151-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | We used to report an unmatch stopUsingNetworkFeature call with an "ok, stopped" response, but we need to report it as an error. bug:3281837 Change-Id: I35728159e62a021cb10de4396b3f60a92df0570f
* | | Have MobileDataStateTracker & DataConnectionTracker communicate directly.Wink Saville2010-12-071-48/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled via the ConnectivityService. It is anticipated that the communication channel will be used for additional commands and to receive unsoliciated commands from DataConnectionTracker back to MobileDataStateTracker. Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8