Commit graph android_packages_modules_Co.../services/java
Message SHA1
am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
* commit '5afb46660c':
  Add RouteInfo objects for tracking routes.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-02 13:29:22 -07:00
90faa5de18
Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6

Robert Greenwalt   commited 2011-05-02 11:17:30 -07:00
5a901298ed
am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
* commit 'c40de32ef7':
  Add support for USB Ethernet adapters

Benoit Goby   authored and   Android Git Automerger   commited 2011-04-11 18:53:57 -07:00
d27954e05a
resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92

Benoit Goby   commited 2011-04-11 18:41:23 -07:00
c40de32ef7
Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d

Benoit Goby   commited 2011-04-11 16:33:43 -07:00
6cec7f3535
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
  ConnectivityService needs to use the new names for the NetConfig vars.

Wink Saville   authored and   Android Git Automerger   commited 2011-04-07 14:29:17 -07:00
75b5e9967f
ConnectivityService needs to use the new names for the NetConfig vars.
Change-Id: I809a624057462871cd1849051286c2bffd5099e9

Wink Saville   commited 2011-04-07 14:23:45 -07:00
f2a6283da9
resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f

Robert Greenwalt   commited 2011-04-07 14:13:52 -07:00
1a087f0f01
Add external dependency API.
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389

Robert Greenwalt   commited 2011-04-07 12:28:37 -07:00
34848c0192
resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf

Robert Greenwalt   commited 2011-04-04 16:26:42 -07:00
1851011379
am 9991017b: Only leave one default network up at a time.
* commit '9991017bbd':
  Only leave one default network up at a time.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-04 12:18:58 -07:00
e00e35a54c
Fix the build.
Fix a bad merge.

Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee

Robert Greenwalt   commited 2011-03-31 10:44:47 -07:00
f7dae30b20
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1

Robert Greenwalt   commited 2011-03-30 15:03:13 -07:00
3a378b9f2d
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-30 09:30:15 -07:00
b2f5deca7d
Only leave one default network up at a time.
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

Robert Greenwalt   commited 2011-03-29 11:36:28 -07:00
9991017bbd
Fix some alt-network issues.
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

Robert Greenwalt   commited 2011-03-25 08:59:08 -07:00
a71471ba9a
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-22 21:37:48 -07:00
23a9f02497
Fix adding of default route.
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

Robert Greenwalt   commited 2011-03-22 18:47:42 -07:00
03d53da1f5
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit bbba216fe3
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7

Wink Saville   commited 2011-03-14 12:25:04 -07:00
b7c92c720f
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-11 11:52:31 -08:00
102b5464b7
DO NOT MERGE Backport of I1f55df8a from master.
Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6

Robert Greenwalt   commited 2011-03-10 17:04:21 -08:00
9e081592aa
am 141623d4: DO NOT MERGE WiMAX support
* commit '141623d480':
  DO NOT MERGE WiMAX support

TK MUN   authored and   Android Git Automerger   commited 2011-03-09 22:54:44 -08:00
8cca8f4c4f
DO NOT MERGE WiMAX support
- 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>

TK MUN   authored and   Simon Wilson   commited 2011-03-09 22:37:08 -08:00
141623d480
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit f6b7669493.

Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636

Wink Saville   commited 2011-03-03 09:53:52 -08:00
bbba216fe3
Merge "Start using NetworkUtils.numericToInetAddress."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-03-02 12:10:51 -08:00
95c300a353
Start using NetworkUtils.numericToInetAddress.
Generates InetAddresses without risking an accidental dns lookup.  For use with supposedly
numeric-only ip address strings.

Change-Id: I694f3976ce1c6382854706f6557ea88a289add3a

Robert Greenwalt   commited 2011-03-02 11:37:32 -08:00
35e34d1276
Merge "Fixing the write of BackgroundData setting."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-02-25 15:20:30 -08:00
af83ea6e1f
Fixing the write of BackgroundData setting.
I outsmarted myself trying to minimize writes and caused no writes to occur.

bug:3485934
Change-Id: I292e6837d29903a21abb6e001d25d96a4cdc18ec

Robert Greenwalt   commited 2011-02-25 13:44:09 -08:00
0ffdef120a
LTE Changes for Telephony including Multiple PDN support and IPV6 support
Added init for CDMAPhone.java

Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9

Wink Saville   commited 2011-02-24 18:23:36 -08:00
f6b7669493
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-02-16 10:51:04 -08:00
730126bf5a
DO NOT MERGE - backport of l92a02b31 from master
Fix handling of multiple possible default networks.

bug:3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537

Robert Greenwalt   commited 2011-02-11 17:32:58 -08:00
084e4774f2
Update LinkProperties treatment of gateways
A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.

bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8

Robert Greenwalt   commited 2011-02-11 11:06:23 -08:00
5c733977a4
am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
  Comment out the isAvailable optimization.

Wink Saville   authored and   Android Git Automerger   commited 2011-01-26 19:09:22 -08:00
2ec53df18d
Comment out the isAvailable optimization.
As the comment says this causes problems if the connection
is handling errors. This removes the optimization for now.

Bug: 3386481
Change-Id: I6cb00abe8b1949e9b79b4906a6bdab5872b5054d

Wink Saville   commited 2011-01-26 15:43:49 -08:00
72a95b97e9
am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
  Make VpnService synchronous API.

Hung-ying Tyan   authored and   Android Git Automerger   commited 2011-01-19 22:46:32 -08:00
4116cd5901
Make VpnService synchronous API.
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

Hung-ying Tyan   commited 2011-01-20 12:51:43 +08:00
4e723420e0
am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
  Turn off DUN connection after tethering.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-01-13 10:25:25 -08:00
b3708c3de8
Turn off DUN connection after tethering.
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

Robert Greenwalt   commited 2011-01-12 15:52:10 -08:00
9f3be4c403
am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
* commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa':
  Fix any_connection reporting.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-01-12 07:21:32 -08:00
e3e5f46511
Fix any_connection reporting.
A recent change caused us to think there was no other connection available
when transitioning from 3g to wifi.

bug:3335074
Change-Id: I1f55df8a0eb5b27131572b111fbaac8f1ebbc0d3

Robert Greenwalt   commited 2011-01-11 18:32:17 -08:00
4b7c55e4ee
am 89c8f755: Merge "Fix handling of multiple possible default networks" into honeycomb
* commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5':
  Fix handling of multiple possible default networks

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-01-07 00:28:55 -08:00
4c6d10445f
Fix handling of multiple possible default networks
Old code assumed only 2 choices but now we have more.

bug:3328196
Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a

Robert Greenwalt   commited 2011-01-06 17:12:23 -08:00
9256485b0b
connectivity-change events can happen before boot completes (similar to:
https://android-git.corp.google.com/g/#change,87425 )


Change-Id: Ibc0f12defaa5d90894657ce63fb352578eca7060

Stan Chesnutt   commited 2011-01-06 11:00:19 -08:00
1f2a2ace5d
Allow bumpDns() to execute correctly before boot has completed
Change-Id: I5c2cf023e555f49d7e29592f9d1439b3ac367e3d

Stan Chesnutt   commited 2011-01-05 17:14:03 -08:00
f444f50b79
Always file DUN requests for tethering.
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

Robert Greenwalt   commited 2011-01-04 11:15:19 -08:00
2cc8744a3d
Cache the current value of background-data.
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

Robert Greenwalt   commited 2010-12-29 16:15:02 -08:00
d62c7000a1
Make sure the ProxyProperties is always present.
Lets people know that it's non-null, though the InetAddr inside may be.

bug:3305689
Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91

Robert Greenwalt   commited 2010-12-28 11:15:06 -08:00
611291c8ef
Reduce the spinning while tethering.
Doing too much stuff - don't retry when we know we shouldn't.

bug:3293460
Change-Id: Ic7b0b6486b39377d74df7a35572059ac60d03fa0

Robert Greenwalt   commited 2010-12-23 17:13:57 -08:00
8ca8876c68
Add TYPE_BLUETOOTH network interface for reverse tethering.
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998

Jaikumar Ganesh   commited 2010-12-22 15:24:18 -08:00
0db51a0631
am 08df90cf: am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '08df90cf80':
  Be sure and report NO_CONNECTIVITY when needed.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-12-22 11:35:06 -08:00
707bdb6f21