Commit Graph

213 Commits

Author SHA1 Message Date
The Android Automerger
fd34a5c57d merge in honeycomb-release history after reset to honeycomb 2011-02-04 22:26:00 -08:00
The Android Automerger
8248739ef0 merge in honeycomb-release history after reset to honeycomb 2011-02-04 10:26:10 -08:00
The Android Automerger
64a1819dd1 merge in honeycomb-release history after reset to honeycomb 2011-01-30 13:37:53 -08:00
The Android Open Source Project
abcb4fecfc Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
d97edba7d1 Merge 6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Robert Greenwalt
9d07781cb6 Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
The Android Automerger
9369876a09 merge in honeycomb-release history after reset to honeycomb 2011-01-27 07:26:17 -08:00
Wink Saville
b52dbfe01a 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
2011-01-26 18:29:51 -08:00
Wink Saville
72a95b97e9 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
2011-01-26 15:43:49 -08:00
The Android Automerger
41333f8e8c merge in honeycomb-release history after reset to honeycomb 2011-01-20 07:41:25 -08:00
Hung-ying Tyan
4e723420e0 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
2011-01-20 12:51:43 +08:00
The Android Automerger
8bd51789b4 merge in honeycomb-release history after reset to honeycomb 2011-01-14 07:22:45 -08:00
The Android Automerger
e809369b62 merge in honeycomb-release history after reset to honeycomb 2011-01-13 07:21:59 -08:00
Robert Greenwalt
9f3be4c403 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
2011-01-12 15:52:10 -08:00
Robert Greenwalt
4b7c55e4ee 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
2011-01-11 18:32:17 -08:00
android-merger
8270623f37 merge (-s ours) history of HRI06B 2011-01-07 15:38:12 -08:00
Robert Greenwalt
4397fdfa34 Fix handling of multiple possible default networks
Old code assumed only 2 choices but now we have more.

bug:3328196
Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a
2011-01-07 11:42:20 -08:00
The Android Automerger
bb89d7cbf5 merge in honeycomb-release history after reset to honeycomb 2011-01-07 07:46:11 -08:00
Robert Greenwalt
9256485b0b Fix handling of multiple possible default networks
Old code assumed only 2 choices but now we have more.

bug:3328196
Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a
2011-01-06 17:12:23 -08:00
The Android Automerger
c924036a9e merge in honeycomb-release history after reset to honeycomb 2011-01-06 07:30:36 -08:00
Stan Chesnutt
f444f50b79 Allow bumpDns() to execute correctly before boot has completed
Change-Id: I5c2cf023e555f49d7e29592f9d1439b3ac367e3d
2011-01-05 17:14:03 -08:00
The Android Automerger
b0a162e68e merge in honeycomb-release history after reset to master 2011-01-05 07:26:31 -08:00
Robert Greenwalt
2cc8744a3d 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
2011-01-04 11:15:19 -08:00
The Android Automerger
88bcabee38 merge in honeycomb-release history after reset to master 2011-01-04 07:31:40 -08:00
Robert Greenwalt
d62c7000a1 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
2010-12-29 16:15:02 -08:00
Robert Greenwalt
611291c8ef 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
2010-12-28 11:15:06 -08:00
Robert Greenwalt
8ca8876c68 Reduce the spinning while tethering.
Doing too much stuff - don't retry when we know we shouldn't.

bug:3293460
Change-Id: Ic7b0b6486b39377d74df7a35572059ac60d03fa0
2010-12-23 17:13:57 -08:00
Benoit Goby
fb2cdd7fe4 Add USB Ethernet support
Change-Id: Idb333f15818f455eedfb62f81358499dc7419f5b
2010-12-23 16:35:52 -08:00
Jaikumar Ganesh
0db51a0631 Add TYPE_BLUETOOTH network interface for reverse tethering.
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
2010-12-22 15:24:18 -08:00
Robert Greenwalt
707bdb6f21 am 08df90cf: am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '08df90cf802172658dc54f09484d83eb080a46cf':
  Be sure and report NO_CONNECTIVITY when needed.
2010-12-22 11:35:06 -08:00
Robert Greenwalt
08df90cf80 am 5d0fafe8: Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
* commit '5d0fafe80752ad4e40fe0ec2bc06c43e669a0612':
  Be sure and report NO_CONNECTIVITY when needed.
2010-12-21 16:06:19 -08:00
Robert Greenwalt
ea8bca0251 Be sure and report NO_CONNECTIVITY when needed.
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
2010-12-21 11:43:28 -08:00
Robert Greenwalt
5364d754c9 Correct an error code to pass CTS.
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
2010-12-15 15:22:50 -08:00
Wink Saville
b9024c6009 Have MobileDataStateTracker & DataConnectionTracker communicate directly.
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
2010-12-07 10:31:02 -08:00
Robert Greenwalt
eb123acefc Add a Dummy data connection for testing purposes.
Enable with:
    <string-array translatable="false" name="networkAttributes">
        <item>"wifi,1,1,1"</item>
        <item>"dummy,7,7,0"</item>
    </string-array>

in your config.xml

Change-Id: I3965edaeb4873e95131f4083b8d23d682ce17841
2010-12-07 07:48:33 -08:00
Robert Greenwalt
d93dc8f82d Make Proxy change broadcast sticky
Makes it easier for apps who care.  Includes the current values.

Change-Id: I5f1d3589a036ebc9910281f97d4780ecda2829f2
2010-12-06 11:29:17 -08:00
Robert Greenwalt
82cde1324d Don't clobber the net hostname if it's already set.
Be a good citizen.

Change-Id: Ic58aeab013e2ff34201be71e01e399390edbbb5f
2010-12-06 09:47:31 -08:00
Wink Saville
e70c6f53c6 Cleanup logging.
Change-Id: Ie73c6d97ec19b0d27e58c085b60e885d90066056
2010-12-03 12:01:38 -08:00
Robert Greenwalt
6f7c609039 Load persisted global proxy settings.
Was persisted before, but not loaded at boot.

Change-Id: I6d6b69ede3d212a8266847d73d07a037ae917788
2010-12-02 12:19:17 -08:00
Robert Greenwalt
c3c5f865a3 Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
2010-11-19 10:24:30 -08:00
Robert Greenwalt
f93a7e934e Merge "Tell each VM to flush their DNS cache." 2010-11-04 17:02:44 -07:00
Elliott Hughes
29666e46f4 Remove NetworkUtils.isIpAddress.
Bug: 3073384
Change-Id: I5bd46d1995186c2384c68d0afff3b869f46624c5
2010-11-04 15:27:33 -07:00
Robert Greenwalt
051642b87b Tell each VM to flush their DNS cache.
bug:3095357
Change-Id: I93de24e3e5a7d8b94d55f4facfffc863a2b8c202
2010-11-04 11:52:35 -07:00
Wink Saville
3425ad6ca6 am 7f8f1e13: am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d'

* commit '7f8f1e13d346bc2d645e9625660aae0c9ee1749d':
  Add some error-case logging.
2010-10-11 10:49:47 -07:00
Wink Saville
7f8f1e13d3 am 96619f9f: Merge "Add some error-case logging." into gingerbread
Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
2010-10-10 12:47:18 -07:00
Robert Greenwalt
e981bc5138 Add some error-case logging.
Turning off all debug logging is a good thing, but it leaves us blind when errors come in.
bug:3075537

Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
2010-10-10 11:26:41 -07:00
Irfan Sheriff
e0b2c0fdc4 Use LinkProperties for IP and proxy configuration
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Irfan Sheriff
fb7c96415b Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Robert Greenwalt
063dc7d9d1 Turn on some debugging info
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Dianne Hackborn
3f5a9b046d resolved conflicts for merge of 93aca85e to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00