Commit Graph

14477 Commits

Author SHA1 Message Date
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
Robert Greenwalt
3ec1eeea3a Get rid of manual int->ipv4 string generation
bug:2542681
Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb
2011-01-26 13:57:24 -08:00
Robert Greenwalt
7baf8a8f08 Make the interface with DHCP IPv6 capable.
It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.

bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
2011-01-26 09:10:01 -08:00
Robert Greenwalt
9f83abb01a Merge "Switch from NetworkUtils to netd for iface config." 2011-01-21 12:06:16 -08:00
Robert Greenwalt
2e1763cb15 Switch from NetworkUtils to netd for iface config.
Moving more stuff to netd and getting rid of unused NetworkUtils.

Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
2011-01-21 10:44:12 -08:00
Brian Muramatsu
f1d59d0bad am 10cf2ff3: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread
* commit '10cf2ff3ef8972c0056344db9be33e3d201ec510':
  fix NoCallPermission tests for non-telephony devices
  Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  fix sms testcases for non-telephony devices
  Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
  fix test for non-telephony devices
  Use Vogar Expectations to Clean Up Remaining Tests
  fix keytests for azerty keyboard
  The layout height should be the value scaled by the density.
  Set ChromeClient to webview to gurantee the getprogress() value
  100ms does not gurantee trigerring the audio. the test always passed with 200ms
  Remove Broken NoActivityRelatedPermissionTest
  fix WQVGA resolution
2011-01-20 15:28:35 -08:00
Brian Muramatsu
10cf2ff3ef Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread 2011-01-20 15:19:16 -08:00
Brian Muramatsu
cda6b3d881 Merge remote branch 'korg/froyo' into manualmerge
Conflicts:
	tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
	tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java

Change-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83
2011-01-20 15:03:31 -08:00
Jean-Baptiste Queru
c02749936f reconcile froyo CTS variants
Change-Id: I3500118d665df5045d800d2e1d70107b47b52baf
2011-01-20 12:24:40 -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
4116cd5901 am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
  Make VpnService synchronous API.
2011-01-19 22:46:32 -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
Brian Muramatsu
19b684137a am ec004f1d: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo
* commit 'ec004f1d40ddfd829584d596d91eef4d2db78db2':
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
2011-01-19 18:29:32 -08:00
Brian Muramatsu
ec004f1d40 Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo 2011-01-19 18:11:48 -08:00
Madan Ankapura
328b217e58 DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
Device can still have a valid networkId even after disconnection
if it was associated with AP, getWifiState is a better check to
get valid state.

Change-Id: I31a8ca38f304fbf639e1f3111be4b5ed406e3b3c
2011-01-19 18:09:45 -08:00
Jean-Baptiste Queru
76aa79e534 Merge from open-source gingerbread
Change-Id: Ia24060add81186960781229089e8b3eee1390935
2011-01-19 08:24:40 -08:00
Brian Muramatsu
9b7ea4afac Merge "Merge remote branch 'korg/froyo' into gingerbread" into gingerbread 2011-01-18 10:47:50 -08:00
The Android Automerger
b1d1b2c8e6 merge in gingerbread-release history after reset to gingerbread 2011-01-16 16:22:06 -08:00
Brian Muramatsu
d9aec36188 Merge remote branch 'korg/froyo' into gingerbread
Change-Id: Ieea971689f21c7a010c49d85818ef4ac089f3202
2011-01-14 14:18:22 -08:00
Brian Muramatsu
1c62779738 am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo
* commit '5766f49549275c02f9a513aae82bcfa867cb551b':
  Test requestRouteToHost() except TYPE_WIFI
2011-01-14 11:58:32 -08:00
The Android Automerger
8bd51789b4 merge in honeycomb-release history after reset to honeycomb 2011-01-14 07:22:45 -08:00
Robert Greenwalt
b3708c3de8 am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
  Turn off DUN connection after tethering.
2011-01-13 10:25:25 -08:00
The Android Automerger
e809369b62 merge in honeycomb-release history after reset to honeycomb 2011-01-13 07:21:59 -08:00
Masanori Ogino
d2488d6ffd Test requestRouteToHost() except TYPE_WIFI
If the device is set Wifi-ON, then testRequestRouteToHost always fails.

Change-Id: Ie487773552e8f6f1d4838755cc39e23c5aa57c1d
2011-01-13 15:52:34 +09: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
e3e5f46511 am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
* commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa':
  Fix any_connection reporting.
2011-01-12 07:21:32 -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
Jean-Baptiste Queru
5e9814b99e reconcile with open-source gingerbread CTS
Change-Id: I48668c65b9c0f0921954d309b4b53e026af3a86f
2011-01-10 12:23:47 -08:00
android-merger
8270623f37 merge (-s ours) history of HRI06B 2011-01-07 15:38:12 -08:00
Brian Muramatsu
b511c888ec Nuke TrafficStatsTest#testTrafficStatsWithHost...
Bug 3189208

Removing this test due to potential problems with GB. This will need to
be brought back and investigated.

Change-Id: Ifeafdf44464c652b063edfb51c5f7931624b6973
2011-01-07 15:19:18 -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
4c6d10445f am 89c8f755: Merge "Fix handling of multiple possible default networks" into honeycomb
* commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5':
  Fix handling of multiple possible default networks
2011-01-07 00:28:55 -08:00
Jesse Wilson
3741bedee7 Deprecate a method that formats only IPv4 addresses.
Anyone calling this method is probably storing IP addresses
in an int, which doesn't make sense anymore.

Change-Id: Iba535b66f6cff47ce07b5ecc6427e3b2fd846998
2011-01-06 19:33:00 -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
Stan Chesnutt
1f2a2ace5d connectivity-change events can happen before boot completes (similar to:
https://android-git.corp.google.com/g/#change,87425 )


Change-Id: Ibc0f12defaa5d90894657ce63fb352578eca7060
2011-01-06 11:00:19 -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
The Android Automerger
cccc3fc167 merge in gingerbread-release history after reset to gingerbread 2010-12-22 08:00:45 -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