Commit Graph

14477 Commits

Author SHA1 Message Date
Wink Saville
a8f3f7c298 am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit 'f4c231c4dcadd4633881c23ecea7327deec61c85':
  Fix initialization of RouteInfo
2011-05-12 14:08:05 -07:00
Wink Saville
f4c231c4dc am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
  Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Chia-chi Yeh
4df51328bd Extract NetworkManagementService out from Tethering to ConnectivityService.
and also some minor refactoring.

Change-Id: I0e74f30ef1b035d9ed37571c512fedc15d05db77
2011-05-11 17:06:07 -07:00
Kazuhiro Ondo
efa66d9fe9 Fix initialization of RouteInfo
IPv6 gateway is not correctly set in RouteInfo

Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
2011-05-11 16:02:00 -07:00
Robert Greenwalt
b5c62b6230 am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit 'f490d72195d330e1232a9025ebe029158f68f5f6':
  Fix the adding of host routes.
2011-05-11 13:07:38 -07:00
Robert Greenwalt
f490d72195 am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
  Fix the adding of host routes.
2011-05-10 11:53:57 -07:00
Robert Greenwalt
bd49221570 Fix the adding of host routes.
We used to just add

Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
2011-05-10 11:27:46 -07:00
Robert Greenwalt
e7dcc1362f am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'df6da5c96bc18cff1785fc30d639b2fe73110fe8':
  Add auto-restore timeout for secondary networks.
2011-05-04 12:47:30 -07:00
Robert Greenwalt
df6da5c96b am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'aae781f32bc769f6275d3cfc200cbbadf3f820f6':
  Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
aae781f32b Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE 2011-05-04 09:59:30 -07:00
Robert Greenwalt
20f819c64b Add auto-restore timeout for secondary networks.
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
2011-05-03 19:10:26 -07:00
Robert Greenwalt
b0d1452d58 resolved conflicts for merge of 90faa5de to master
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6
2011-05-02 14:41:57 -07:00
Irfan Sheriff
52b5163b83 am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '78204ba57cf9f907a70f943f140f88a02bc51efe':
  Add DhcpStateMachine for interation with dhcpcd
2011-05-02 13:29:36 -07:00
Robert Greenwalt
90faa5de18 am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
* commit '5afb46660c3f6e622302bbd77c25f9e1275f2c2f':
  Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
5afb46660c Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE 2011-05-02 13:26:52 -07:00
Irfan Sheriff
78204ba57c am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
  Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12:26:52 -07:00
Robert Greenwalt
5a901298ed 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
2011-05-02 11:17:30 -07:00
Irfan Sheriff
204cec7dd5 Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Brian Muramatsu
d664911394 am 916dd596: am 244f1a3a: am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '916dd5960fc0e572415e3526ac0d9029c3b7d576':
  Backport from HC to Fix NetworkInfoTest
2011-04-27 15:23:36 -07:00
Brian Muramatsu
244f1a3a42 am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '8128f7facef4648320b7ea4f93f27014ea153ac9':
  Backport from HC to Fix NetworkInfoTest
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
  Farewell Magnetometer Test
2011-04-27 14:47:17 -07:00
Brian Muramatsu
8128f7face Merge remote branch 'goog/gingerbread' into manualmerge
Conflicts:
	tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
	tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
	tests/tests/net/src/android/net/cts/NetworkInfoTest.java

Change-Id: Ia16b95167e5c023cc977ea9d6bf2323d5c6cbf71
2011-04-27 13:51:31 -07:00
Robert Greenwalt
ef903acab4 am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit '8177aee2dc06601701d0ed8e8efb20ed787e6153':
  Make new networkAttribute parameter non-optional.
2011-04-26 01:35:39 -07:00
Robert Greenwalt
8177aee2dc am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -07:00
Robert Greenwalt
2240524be9 Make new networkAttribute parameter non-optional.
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Robert Greenwalt
f76c55d289 Expose more net types to the public.
Ethernet and bluetooth.

Change-Id: Ic499709ffa151c0f27aef497373a8de7289e3e7f
2011-04-22 18:09:03 -07:00
Xia Wang
cf5f6fa087 Backport from HC to Fix NetworkInfoTest
Bug 4322307

Fixed some other assertions that didn't check for
either CONNECTING or CONNECTED. Cleaned up some
code and removed some extraneous checks.

Original description:
"Fix cts tests for Wi-Fi only devices.

For Wi-Fi only device,
startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE
stopUsingNetworkFeature() return 1;

In NetworkInfoTest:
cm.getAllNetworkInfo() returns an array of NetworkInfo.
But the index is not based on network type."

Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16
2011-04-22 13:34:49 -07:00
Xia Wang
4a88b709cc Backport from HC to Fix NetworkInfoTest
Bug 4322307

Fixed some other assertions that didn't check for
either CONNECTING or CONNECTED. Cleaned up some
code and removed some extraneous checks.

Original description:
"Fix cts tests for Wi-Fi only devices.

For Wi-Fi only device,
startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE
stopUsingNetworkFeature() return 1;

In NetworkInfoTest:
cm.getAllNetworkInfo() returns an array of NetworkInfo.
But the index is not based on network type."

Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16
2011-04-21 17:46:29 -07:00
Brian Muramatsu
e821709d86 am d6ad59ae: am 6389fa31: am 68cb323d: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d':
2011-04-18 03:17:47 -07:00
Brian Muramatsu
6389fa316d am 68cb323d: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '68cb323d1bbfc26fab0fb77d8de289a9cc02efd6':
  Parallelize Test Description Generalization
  Remove RequiredFeatures Annotation
  Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function.
  EGL Config Test
  Allow saving log files in different directory
  StartPreview only after setting fps range paramters
  Fix for the handling of SMS Delivery Report in case of CDMA network
  Fix WifiInfoTest
  Remove Unused Spec Progress Tool
  Fix Build
  Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship
  Added sleep within testGetAndSetMasterSyncAutomatically.
2011-04-15 15:30:13 -07:00
Brian Muramatsu
68cb323d1b Merge remote branch 'goog/gingerbread' into manualmerge 2011-04-15 14:57:34 -07:00
Elliott Hughes
c944a7dedc More native code cleanup.
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.

Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
2011-04-12 11:28:59 -07:00
Benoit Goby
ef54af248b resolved conflicts for merge of d27954e0 to master
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
2011-04-11 19:07:11 -07:00
Benoit Goby
d27954e05a am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
  Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
c40de32ef7 resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brian Muramatsu
22f7fba623 am 5a1b76b8: am a6e507ee: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread
* commit '5a1b76b822420df5baf69701f1da1bfecc16cae0':
  Fix WifiInfoTest
2011-04-11 17:32:52 -07:00
Benoit Goby
6cec7f3535 Add support for USB Ethernet adapters
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Brian Muramatsu
a6e507ee6a am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread
* commit '1ebfc31a62d1096b5e07d23c8f50da8dc7402b00':
  Fix WifiInfoTest
2011-04-07 15:03:45 -07:00
Wink Saville
75d9e1cd13 am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '75b5e9967f4c61642316c8a8a861c51d2aa3faeb':
  ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:31:20 -07:00
Wink Saville
75b5e9967f 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.
2011-04-07 14:29:17 -07:00
Wink Saville
f2a6283da9 ConnectivityService needs to use the new names for the NetConfig vars.
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -07:00
Robert Greenwalt
f7ca6f7ddf am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
* commit '1a087f0f01e4ea6900e5d922df68cbe908d6d1c9':
  Add external dependency API.
2011-04-07 14:22:03 -07:00
Robert Greenwalt
1a087f0f01 resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
2879f7352b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
a8191da467 am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit 'f2cc9d1c7a54d92ed5d8357253963db4b614d203':
  Make LinkProperties comparable.
2011-04-07 12:48:17 -07:00
John Wang
f2cc9d1c7a am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit '5d6f1167039e22889545212ce18192460f9b503e':
  Make LinkProperties comparable.
2011-04-07 12:46:18 -07:00
John Wang
3e567d5c3a Make LinkProperties comparable.
Add equals() and hashcode() to LinkProperties and related fields.

Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
2011-04-07 12:36:56 -07:00
Robert Greenwalt
34848c0192 Add external dependency API.
An APN will not be connected to if some external dependency is not met.

bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Brian Muramatsu
a76e6617fe am 4d2f2058: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '4d2f2058ddeb36c8d6c96a277b58cdef897ddf88':
  Fix WifiInfoTest
  Update NO_DELIVERY_REPORTS list.
  Update Expectations File
  Remove Test Annotation Related Tools
  Clean Up VideoViewTest
  CTS: Fixes a possible "out of memory" exception
2011-04-07 11:46:59 -07:00
Brian Muramatsu
4d2f2058dd Merge remote branch 'goog/gingerbread' into manualmerge
Conflicts:
	tests/expectations/knownfailures.txt

Change-Id: I9db887535ef970eef0209251460c13b367f23779
2011-04-07 11:30:45 -07:00
Irfan Sheriff
5c990cd714 Fix WifiInfoTest
Do not listen to supplicant state change for wifi disable action,
instead depend on wifi state changed action

Bug: 4242273
Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e
2011-04-07 11:13:45 -07:00