Commit Graph

3757 Commits

Author SHA1 Message Date
Wink Saville
1746543a54 Cleanup copyright dates add missing method.
Change-Id: I2d8fe0b705e7c90efabb8b3427a539a4a1056874
2010-09-21 09:16:38 -07:00
Robert Greenwalt
325eed464f am 6548f395: Merge "Inet status bug fix" into gingerbread
Merge commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef' into gingerbread-plus-aosp

* commit '6548f395a974d2a8dcefe29b3a498d1ca87d8aef':
  Inet status bug fix
2010-09-21 08:22:59 -07:00
The Android Automerger
070568fa19 Merge branch 'gingerbread' into gingerbread-release 2010-09-21 07:11:48 -07:00
Robert Greenwalt
b2a9e4957a Inet status bug fix
Don't wipe out the connected status every time we get a cellular status change.
Don't filter out disconnect event for wifi - we need them.

bug:3009923
Change-Id: I68cadac5f44d6eb4e0fe711fda7c5d218abb45bd
2010-09-21 05:38:36 -07:00
Robert Greenwalt
2097907748 am 313af5a3: Merge "Add Inet Condition log to bugreports" into gingerbread
Merge commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a' into gingerbread-plus-aosp

* commit '313af5a3b5ba51eb75dea35eb568c841aa4beb6a':
  Add Inet Condition log to bugreports
2010-09-20 21:31:29 -07:00
Robert Greenwalt
0e80be1a8d Add Inet Condition log to bugreports
Reports who reports what condition on which network at what time.  Where is implied.

Change-Id: I89fbc7323dec438041859fcc934169fa325f0133
2010-09-20 16:00:44 -07:00
Robert Greenwalt
9f0ee4fcde Enhance http proxy support
Make it read proxys the correct way from CS so it works for all network types.
Add utility class for apache http client support.

bug:2700664
Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596
2010-09-17 16:14:10 -07:00
The Android Automerger
16f3dfe9d3 Merge branch 'gingerbread' into gingerbread-release 2010-09-16 09:39:15 -07:00
Robert Greenwalt
978f509cea am 7d6070c3: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '7d6070c3fd486af99f44c0fa3d4e8a7bc484ed95'

* commit '7d6070c3fd486af99f44c0fa3d4e8a7bc484ed95':
  Update Inet Connection Status display
2010-09-15 19:49:53 -07:00
Robert Greenwalt
7d6070c3fd am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
d3401f9b40 Update Inet Connection Status display
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.

Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024

Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00
Irfan Sheriff
a416052905 Add per network static IP settings
Remove the existing global static IP settings and add support
for per network configuration

Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f
2010-09-14 16:15:22 -07:00
The Android Automerger
19c7b34934 Merge branch 'gingerbread' into gingerbread-release 2010-09-13 07:49:13 -07:00
Robert Greenwalt
eaecb133ea Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-10 11:35:27 -07:00
Robert Greenwalt
3b3a726199 Merge "Fix the build" 2010-09-09 14:26:38 -07:00
Robert Greenwalt
b3102acc81 Fix the build
add '*' so javadoc recognizes a comment block and finds the required @hide..

Change-Id: If665ba6549f9e017c063ea2800b7970917c33bdf
2010-09-09 14:22:59 -07:00
Robert Greenwalt
cf1a56c8ba Fix the build
broken merge resolution.

Change-Id: Idf1abef1ef79ddc43b9eaba1e0e523085702e2fe
2010-09-09 14:05:10 -07:00
Robert Greenwalt
24118e8a28 resolved conflicts for merge of ee6dfc50 to master
Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed
2010-09-09 13:15:32 -07:00
Robert Greenwalt
ee6dfc507a am 0727a865: Merge "Add network condition reporting." into gingerbread
Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp

* commit '0727a865d83b944c2fecc0bf1228a36976fe5300':
  Add network condition reporting.
2010-09-09 09:49:15 -07:00
Robert Greenwalt
986c741ac1 Add network condition reporting.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons.  Final icons TBD.

bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
2010-09-09 09:33:02 -07:00
Robert Greenwalt
75ba3f8068 Merge "Some cleanup of Proxy class." 2010-09-08 15:35:40 -07:00
Robert Greenwalt
98f45836b6 Some cleanup of Proxy class.
Switch to using InetSocketAddress.

Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
2010-09-03 16:18:41 -07:00
Wink Saville
775aad68d3 Fix and simplify ConnectivityService singleton.
Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d
2010-09-02 19:23:52 -07:00
Joe Onorato
56023ad2c6 Revert "Changed ConnectivityService#getServiceInstance so its a singleton."
This reverts commit 7323ea10cd which causes this exception:

E/SystemServer( 2653): Failure starting Connectivity Service
E/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()
E/SystemServer( 2653):  at java.lang.Object.wait(Native Method)
E/SystemServer( 2653):  at java.lang.Object.wait(Object.java:358)
E/SystemServer( 2653):  at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)
E/SystemServer( 2653):  at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)
E/SystemServer( 2653):  at com.android.server.ServerThread.run(SystemServer.java:262)

Change-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb
2010-09-01 21:18:22 -07:00
Robert Greenwalt
329e04abc8 Merge "Fix NPE in toString" 2010-09-01 16:18:01 -07:00
Robert Greenwalt
94daa185b8 Add a default dns entry if none is provided
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.

bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
2010-09-01 15:25:51 -07:00
Wink Saville
7323ea10cd Changed ConnectivityService#getServiceInstance so its a singleton.
Change-Id: I27b5688a50917b01fb2fcd1c124da77ccae226b5
2010-09-01 14:48:29 -07:00
Robert Greenwalt
e422ad9819 Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
2010-09-01 10:09:40 -07:00
Andrew Stadler
e55ada7892 Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
2010-08-31 14:28:58 -07:00
Irfan Sheriff
fd151ec69b Fix reboot loop due to NPE
Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
2010-08-30 20:40:19 -07:00
Robert Greenwalt
1f1bcfe6a2 Rename NetworkProperties to LinkProperties
Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
2010-08-30 15:54:37 -07:00
Robert Greenwalt
906eda5bac Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Wink Saville
78f04d105c Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Wink Saville
7d85790ad8 Add NetworkProperties to DataConnection.
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
2010-08-27 11:15:18 -07:00
Robert Greenwalt
7fe44cbc2b resolved conflicts for merge of 4ea54f44 to master
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56
2010-08-27 11:05:11 -07:00
Robert Greenwalt
46403bf739 am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b'

* commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b':
  Add an API to request route to an IPv6 host.
2010-08-26 13:14:17 -07:00
Robert Greenwalt
7ac5d3748d resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
2010-08-25 17:48:47 -07:00
Robert Greenwalt
ded8148cb4 am a488bc40: am cb749fbc: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit 'a488bc40a330e0483fa702614922b843c8775cc2'

* commit 'a488bc40a330e0483fa702614922b843c8775cc2':
  Send all Connectivity broadcasts.
2010-08-24 15:21:08 -07:00
Robert Greenwalt
a488bc40a3 am cb749fbc: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit 'cb749fbc240b9726fb7b5c01ca27a79e3f402235' into gingerbread-plus-aosp

* commit 'cb749fbc240b9726fb7b5c01ca27a79e3f402235':
  Send all Connectivity broadcasts.
2010-08-24 12:04:52 -07:00
Robert Greenwalt
cb749fbc24 Merge "Send all Connectivity broadcasts." into gingerbread 2010-08-24 12:01:50 -07:00
Robert Greenwalt
ab5c8b15df Send all Connectivity broadcasts.
We were using a flag so new broadcasts replaced old.  If people are expecting
to see all the broadcasts they sometimes would fail.

bug:2892383
Change-Id: I63df17fe8f8c68f59e1ad6297fe93e169b4463b4
2010-08-24 11:47:10 -07:00
Robert Greenwalt
220e01089f am 57c5c01d: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '57c5c01d5e725a913b24b3dedd9806240cbaf591'

* commit '57c5c01d5e725a913b24b3dedd9806240cbaf591':
  DO NOT MERGE Fixing Connectivity
2010-08-24 09:02:05 -07:00
Robert Greenwalt
57c5c01d5e am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
2010-08-20 12:04:07 -07:00
Robert Greenwalt
da9f734152 DO NOT MERGE Fixing Connectivity
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed.  Fixed differently on master.

bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
2010-08-20 10:01:55 -07:00
Banavathu, Srinivas Naik
7601f575aa Add an API to request route to an IPv6 host.
Add API to create a route to an IPv6 host through a particular
interface.

Change-Id: I7649051e94832576e02b5f5ad17abe093d21d48e
2010-08-19 12:50:35 -07:00
Danica Chang
965670546b bluetooth tethering
Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767
2010-08-18 15:07:50 -07:00
Jean-Baptiste Queru
f55f8c3d3c am 1d05df5a: (-s ours) Revert "- updates NetUtils to use new libnetutils headers"
Merge commit '1d05df5ac17797cbb06c09ad9c6f91af5ec34fbe'

* commit '1d05df5ac17797cbb06c09ad9c6f91af5ec34fbe':
  Revert "- updates NetUtils to use new libnetutils headers"
2010-08-18 13:35:26 -07:00
Jean-Baptiste Queru
1d05df5ac1 Revert "- updates NetUtils to use new libnetutils headers"
This reverts commit c23dbd2557.
2010-08-18 11:16:42 -07:00
Robert Greenwalt
0dea2993fe am baa1b696: (-s ours) am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'baa1b6969765cf791158b458a5f94e4278526970'

* commit 'baa1b6969765cf791158b458a5f94e4278526970':
  DO NOT MERGE Always set/remove default routes.
2010-08-16 15:17:54 -07:00
Wink Saville
7fabfa2e6c Add documentation to NetworkStateTracker and a small change to the API.
Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
2010-08-13 16:11:42 -07:00