Commit graph

4,287 commits

Message SHA1
Merge "Some cleanup of Proxy class."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2010-09-08 15:35:40 -07:00
75ba3f8068
Some cleanup of Proxy class.
Switch to using InetSocketAddress.

Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27

Robert Greenwalt   commited 2010-09-03 16:18:41 -07:00
98f45836b6
Fix and simplify ConnectivityService singleton.
Change-Id: Idb74854db9d801c1cc138eb5ca866cf01940ff6d

Wink Saville   commited 2010-09-02 19:23:52 -07:00
775aad68d3
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

Joe Onorato   commited 2010-09-01 21:18:22 -07:00
56023ad2c6
Merge "Fix NPE in toString"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2010-09-01 16:18:01 -07:00
329e04abc8
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

Robert Greenwalt   commited 2010-09-01 15:25:51 -07:00
94daa185b8
Changed ConnectivityService#getServiceInstance so its a singleton.
Change-Id: I27b5688a50917b01fb2fcd1c124da77ccae226b5

Wink Saville   commited 2010-09-01 14:48:29 -07:00
7323ea10cd
Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977

Robert Greenwalt   commited 2010-09-01 10:09:40 -07:00
e422ad9819
Fix crash when proxy exclusion list is null.
Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17

Andrew Stadler   commited 2010-08-31 14:28:58 -07:00
e55ada7892
Fix reboot loop due to NPE
Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b

Irfan Sheriff   commited 2010-08-30 20:40:19 -07:00
fd151ec69b
Rename NetworkProperties to LinkProperties
Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615

Robert Greenwalt   commited 2010-08-30 15:54:37 -07:00
1f1bcfe6a2
Merge "resolved conflicts for merge of 4ea54f44 to master"
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2010-08-27 17:27:02 -07:00
906eda5bac
Merge "Add NetworkProperties to DataConnection."
Wink Saville   authored and   Android (Google) Code Review   commited 2010-08-27 11:38:48 -07:00
78f04d105c
Add NetworkProperties to DataConnection.
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8

Wink Saville   commited 2010-08-27 11:15:18 -07:00
7d85790ad8
resolved conflicts for merge of 4ea54f44 to master
Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56

Robert Greenwalt   commited 2010-08-27 11:05:11 -07:00
7fe44cbc2b
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.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-26 13:14:17 -07:00
46403bf739
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505

Robert Greenwalt   commited 2010-08-25 17:48:47 -07:00
7ac5d3748d
am a488bc40: am cb749fbc: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit 'a488bc40a3'

* commit 'a488bc40a3':
  Send all Connectivity broadcasts.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-24 15:21:08 -07:00
ded8148cb4
am cb749fbc: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit 'cb749fbc24' into gingerbread-plus-aosp

* commit 'cb749fbc24':
  Send all Connectivity broadcasts.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-24 12:04:52 -07:00
a488bc40a3
Merge "Send all Connectivity broadcasts." into gingerbread
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2010-08-24 12:01:50 -07:00
cb749fbc24
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

Robert Greenwalt   commited 2010-08-24 11:47:10 -07:00
ab5c8b15df
am 57c5c01d: (-s ours) am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '57c5c01d5e'

* commit '57c5c01d5e':
  DO NOT MERGE Fixing Connectivity

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-24 09:02:05 -07:00
220e01089f
am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-20 12:04:07 -07:00
57c5c01d5e
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

Robert Greenwalt   commited 2010-08-20 10:01:55 -07:00
da9f734152
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

Banavathu, Srinivas Naik   authored and   Banavathu Srinivas Naik   commited 2010-08-19 12:50:35 -07:00
7601f575aa
bluetooth tethering
Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767

Danica Chang   commited 2010-08-18 15:07:50 -07:00
965670546b
am 1d05df5a: (-s ours) Revert "- updates NetUtils to use new libnetutils headers"
Merge commit '1d05df5ac1'

* commit '1d05df5ac1':
  Revert "- updates NetUtils to use new libnetutils headers"

Jean-Baptiste Queru   authored and   Android Git Automerger   commited 2010-08-18 13:35:26 -07:00
f55f8c3d3c
Revert "- updates NetUtils to use new libnetutils headers"
This reverts commit c23dbd2557.

Jean-Baptiste Queru   commited 2010-08-18 11:16:42 -07:00
1d05df5ac1
am baa1b696: (-s ours) am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'baa1b69697'

* commit 'baa1b69697':
  DO NOT MERGE Always set/remove default routes.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-16 15:17:54 -07:00
0dea2993fe
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

Wink Saville   commited 2010-08-13 16:11:42 -07:00
7fabfa2e6c
am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.

Robert Greenwalt   authored and   Android Git Automerger   commited 2010-08-13 16:03:29 -07:00
baa1b69697
DO NOT MERGE Always set/remove default routes.
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa

Robert Greenwalt   commited 2010-08-13 15:53:13 -07:00
0ef6875b30
Split WifiStateMachine from WifiStateTracker
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053

Irfan Sheriff   commited 2010-08-10 15:18:25 -07:00
25be076f74
Fix runtime reset (missing case break).
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c

Daniel Sandler   commited 2010-08-04 23:57:00 -04:00
4a1052ea35
Avoid hostname lookup in NetworkProperties
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05

Irfan Sheriff   commited 2010-08-04 15:15:49 -07:00
a89f2ad616
Always try to set/remove default routes
Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on the same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: I589a0b2768b5e67b608fde181e7ddbd7fce4f491

Robert Greenwalt   commited 2010-08-02 15:40:21 -07:00
3afbead19f
Refactor WifiStateTracker
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb

Irfan Sheriff   commited 2010-07-27 11:59:29 -07:00
653e2a2f64
Pass network properties to ConnectivityService.
Used as a bag to hold ipaddr, gateway, dns, proxy info.
addr's are InetAddresses for v4/v6 use.  Cleaning up some old v4-only code

bug:2655015
Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59

Robert Greenwalt   commited 2010-07-13 18:07:41 -07:00
a7dfbd3a1d
Undo previous merge
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900

Jean-Baptiste Queru   commited 2010-06-21 12:37:08 -07:00
4e6e6a1042
resolved conflicts for merge of 6c9a3004 to master
Change-Id: Ia1a8a2015c087004d3dfc64681dbe0315558dc95

Jean-Baptiste Queru   commited 2010-06-21 11:44:49 -07:00
c2475fbb4c
Move the net transition wakelock to ConnService.
When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections.  We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147

Robert Greenwalt   commited 2010-06-16 11:04:37 -07:00
93dc104209
merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3

The Android Open Source Project   commited 2010-06-15 11:37:17 -07:00
2198ddbc38
- updates NetUtils to use new libnetutils headers
- updates WifiStateTracker to track net.XXX.dnsX properties for name servers
- removes dhcp from WifiNative (use NetworkUtils instead)

Change-Id: Ic69ff253e8784cad34e9291e7970ee38bfa235b9

Szymon Jakubczak   authored and   Jean-Baptiste Queru   commited 2010-06-15 10:22:25 -07:00
c23dbd2557
Make NetworkStateTracker an interface
As part of the WifiStateTracker cleanup, need
to have NetworkStateTracker as an interface.

Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936

Irfan Sheriff   commited 2010-06-10 10:55:23 -07:00
7f132d9680
Clean up APN notifications.
Add APNType info to notifications so you can tell what's happening.  Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42

Robert Greenwalt   commited 2010-06-09 16:52:01 -07:00
d391e894a3
Add definitions for WiMAX and iDen network types.
b/2509185

Change-Id: Icf07ce857874e200712218713edbdbb47e646297

jsh   commited 2010-03-15 15:31:08 -07:00
bfa8172505
Run WifiWatchdogServiceThread only on wifi enable
Bug: 2508997
Change-Id: Ib79ee25fcc8e39e9a1d6c5b9ef9681bc00b6d006

Irfan Sheriff   commited 2010-03-12 13:16:47 -08:00
324ec572ab
Stop creating threads for tethering.
Use the passed in looper and save threads.

Change-Id: I6db04ef64e339a5fb2b71e9fb1da32e2d600447c

Robert Greenwalt   commited 2010-03-11 15:39:30 -08:00
c0b6c60d14
Make HiPri work when already connected.
A recent change made the HiPri MobileDataStateTracker listen for notifications
about the default connection (which HiPri shadows).  Local code was sending
itself a notification using the old HiPri badging instead of the new Default
badging and those notifications where therefore ignored.

Manifested itself on HiPri connections when we were already on 3g.

See change 42422 on master platform/frameworks/base for the change this is completing.

Change-Id: I375026048724d0035297287c61c6c2f58d4e0294

Robert Greenwalt   commited 2010-03-10 16:19:18 -08:00
46ceefadaa
Fix NO_CONNECTIVITY flag in some cases.
Airplane mode seemed to hit this bug.

bug:2498268
Change-Id: I5af9266fbbad3e2323d30d7471058f0f4ec3f544

Robert Greenwalt   commited 2010-03-09 14:55:08 -08:00
129843273d