Commit Graph

73838 Commits

Author SHA1 Message Date
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
Kenny Root
4ad1fbff0f am fb79b7da: am d347480a: Fix buffer compacting in NativeDaemonConnector
Merge commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f'

* commit 'fb79b7dab3ccaf490e8cbb18c9feed7080e4b54f':
  Fix buffer compacting in NativeDaemonConnector
2010-09-02 22:32:39 -07:00
Kenny Root
d347480a18 Fix buffer compacting in NativeDaemonConnector
The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.

Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
2010-09-02 22:24:06 -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
Jean-Baptiste Queru
c2ff62b1be am bacc3aa8: am b03c4592: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7'

* commit 'bacc3aa85ee1a1b5dbf2e92522dde8eb0526bdb7':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-24 12:09:03 -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
Jean-Baptiste Queru
b03c459224 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
2010-08-23 19:08:27 -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
Danica Chang
405d5ff482 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
Kenny Root
57b7c0b7a0 am eeeaf73a: (-s ours) Add more error checking for ndc
Merge commit 'eeeaf73a023f66463f83f7048f98cc40a626e59a' into gingerbread

* commit 'eeeaf73a023f66463f83f7048f98cc40a626e59a':
  Add more error checking for ndc
2010-08-18 08:50:56 -07:00
Kenny Root
877d231382 Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:32:20 -07:00
Kenny Root
eeeaf73a02 Add more error checking for ndc
In NativeDaemonConnector.doCommand() calls, there was inconsistent error
checking. This change adds error checking for every call and makes it so
that any call to .doCommand() that gets an error code won't cause the
code to hang forever.

Change-Id: If714282b6642f278fb8137f652af1a012670253b
2010-08-17 23:29:46 -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
Robert Greenwalt
baa1b69697 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.
2010-08-13 16:03:29 -07:00
Robert Greenwalt
0ef6875b30 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
2010-08-13 15:53:13 -07:00
Irfan Sheriff
25be076f74 Split WifiStateMachine from WifiStateTracker
Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
2010-08-10 15:18:25 -07:00
Daniel Sandler
4a1052ea35 Fix runtime reset (missing case break).
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c
2010-08-04 23:57:00 -04:00
Irfan Sheriff
a89f2ad616 Avoid hostname lookup in NetworkProperties
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Robert Greenwalt
3afbead19f 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
2010-08-02 15:40:21 -07:00
Irfan Sheriff
653e2a2f64 Refactor WifiStateTracker
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
2010-07-27 11:59:29 -07:00
Robert Greenwalt
a7dfbd3a1d 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
2010-07-13 18:07:41 -07:00
Brian Muramatsu
fa2e66961f DO NOT MERGE Merge Eclair CTS Changes into Froyo
Changes to branches beyond Froyo will be done separately to avoid
further merge conflicts.

Change-Id: I157c687fa059f9505f5cf62b6d1348b0411bca1c
2010-07-07 11:53:35 -07:00
Jean-Baptiste Queru
4e6e6a1042 Undo previous merge
Change-Id: I7b8b62a8f69a6db551cfef3a5b4bc2de8f97d900
2010-06-21 12:37:08 -07:00