Commit Graph

396 Commits

Author SHA1 Message Date
Ashish Sharma
e982f711a3 Merge "Fix a minor documentation bug in TrafficStats." 2011-01-31 17:32:40 -08:00
Ashish Sharma
beda53d5a6 Fix a minor documentation bug in TrafficStats.
Change-Id: I3cf2199797d875ccb6ab432c298afaace44c7527
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-01-31 14:30:16 -08:00
Robert Greenwalt
b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
2011-01-29 09:32:04 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Ashish Sharma
c39c1d4dee TrafficStats: Include UDP stats and packet count to API
Change-Id: I70063e6033d3c181bcc5b9e401f9474900e25281
Signed-off-by: Ashish Sharma <ashishsharma@google.com>
2011-01-27 15:52:38 -08:00
Robert Greenwalt
68e18d2329 Fix the build
Check for null before trying to make InetAddresses.

Change-Id: I3228eea32eb455437dd76be2de56a913884f3f6e
2011-01-27 10:49:27 -08:00
Robert Greenwalt
b27ce98451 am 89a54408: Merge "Update networktype before sending state change." into gingerbread
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
2011-01-27 10:20:33 -08:00
Robert Greenwalt
70d2c4d82c Get rid of manual int->ipv4 string generation
bug:2542681
Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb
2011-01-26 13:57:24 -08:00
Robert Greenwalt
67881c414a Update networktype before sending state change.
Fixes potential race condition in network-type info.  May fix this issue.

bug:3376930
Change-Id: I3d5fd7c76e54923b62c56defa947be3c9c1cd585
2011-01-26 13:39:46 -08:00
Robert Greenwalt
0216e61819 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
Brian Carlstrom
aa16a0f357 am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:03:52 -08:00
Brian Carlstrom
4140faeebb Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
Bug: 3086427
Change-Id: I7af99fe4c36d9a519777f0499ccab65646313879
2011-01-24 18:17:21 -08:00
Robert Greenwalt
27d3c5907c 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
Irfan Sheriff
ff017477f8 am fc6ef518: am 326feb89: Merge "Pick an upstream interface with valid IP config" into honeycomb
* commit 'fc6ef518e0696ca45608ca07803aa50081f9f72f':
  Pick an upstream interface with valid IP config
2011-01-17 14:47:41 -08:00
Irfan Sheriff
29552095e1 Pick an upstream interface with valid IP config
As a work around for the issue of picking
the wrong interface, add a check for selecting
an upstream interface that has a valid IP configuration

Bug: 3362306
Change-Id: I01084517cff756c97660b2cfbfa8e9bf26673148
2011-01-17 13:50:48 -08:00
Robert Greenwalt
e5a3556268 am 7b04b1d7: am 1e02ebd2: Merge "Update network subtypes info so it is current." into honeycomb
* commit '7b04b1d7ff7a38be30794c25e893beb40616affb':
  Update network subtypes info so it is current.
2011-01-14 12:28:58 -08:00
Robert Greenwalt
17415b9292 Update network subtypes info so it is current.
bug:3327895
Change-Id: Ic1e2a5527c651333af50cc5cfa6c44a15b991fb0
2011-01-14 11:23:54 -08:00
Wink Saville
1a7e671902 Revert "Propagate new link-status-change message to any NetworkManagementService"
This reverts commit 780dfa42aa.
2011-01-09 12:16:38 -08:00
Stan Chesnutt
780dfa42aa Propagate new link-status-change message to any NetworkManagementService
observers.  Also fix the syntax of the "interface-status-change" message.  Add
a null handler in the ThrottleService and Tethering classes (plus fix names).

Change-Id: I58cabc7b0ce5662243bc6513b2de4818065e6c52
2011-01-07 11:40:33 -08:00
Vasu Nori
a085ef3e35 am a270bd59: Merge "fix a long-standing \'typo\' bug" into honeycomb
* commit 'a270bd59a8e6d291af8c1cfcf13af5260ec0ed5a':
  fix a long-standing 'typo' bug
2011-01-07 00:29:38 -08:00
Jesse Wilson
07481ccd1d 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
Vasu Nori
29549c7abd fix a long-standing 'typo' bug
bug:2676368
Change-Id: Ie7381f343223c3bd4757de962efab7b75fe2cf1d
2011-01-06 18:46:39 -08:00
Jean-Baptiste Queru
4887804ea6 am a6ac0ec3: am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit 'a6ac0ec30dfdacb7baba126b5cea69fc7097496e':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:53:41 -08:00
Jean-Baptiste Queru
a6ac0ec30d am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
  according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00
Robert Greenwalt
55985bed7b 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
Bin Jin
b19c9c3994 according to rfc2617, nc-value = 8LHEX
Change-Id: I8646fd8d68cfa4786ee6fc24a757b2af93955c4b
2010-12-25 17:53:30 +08:00
Jaikumar Ganesh
15c7439acb Add TYPE_BLUETOOTH network interface for reverse tethering.
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
2010-12-22 15:24:18 -08:00
Robert Greenwalt
778c0ba858 Fix some older (depricated) API so they work.
Just because they're depricated doesn't mean we can neglect them.

Change-Id: I7556456bd8be2ec57b81b092f75b4b613b538d46
2010-12-15 10:43:04 -08:00
Robert Greenwalt
091969af90 Merge "Fix some IpV4-only code." 2010-12-14 15:28:01 -08:00
Robert Greenwalt
04808c2940 Fix some IpV4-only code.
InterfaceConfiguration changed to use InetAddress and stop with the string->int->string
conversions.

bug:2542681
Change-Id: I11c4954547333c43bb840fa0469ddde57b0d043b
2010-12-14 14:41:26 -08:00
Robert Greenwalt
7c25cd15bb Merge "DHCP core classes, defining data, behavior, and state transitions for the DHCP protocol. The DHCP client and DHCP server classes are not included in this commit: still working out some integration issues with ethernet & wifi services" 2010-12-14 14:40:49 -08:00
Stan Chesnutt
7da02ad3b7 DHCP core classes, defining data, behavior, and state transitions for the DHCP
protocol.  The DHCP client and DHCP server classes are not included in this
commit: still working out some integration issues with ethernet & wifi services

Change-Id: I0c9cc48b7d960005b73ecb757c1fa66f0eb68471
2010-12-14 09:49:26 -08:00
Nick Kralevich
b019ef6158 am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
  Avoid leaking sockets.
2010-12-13 16:30:10 -08:00
Nick Kralevich
30ad1e576a am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
  Avoid leaking sockets.
2010-12-13 15:05:20 -08:00
Nick Kralevich
2ed20f8768 Avoid leaking sockets.
When a DNS lookup fails, we end up creating a datagram socket
but never properly close it.  This wastes limited valuable file
descriptors and causes CTS test failures.  Generally, we should
ensure that sockets or files are opened in a try block, and closed
in a finally block.

Bug: 3276283
Change-Id: I3432f3bc061268c7367948230f6edbdfcec55892
2010-12-13 14:32:17 -08:00
Wink Saville
e798268f16 Have MobileDataStateTracker & DataConnectionTracker communicate directly.
Added CMD_SET_DATA_ENABLE which is sent when data is enabled/disabled
via the ConnectivityService. It is anticipated that the communication
channel will be used for additional commands and to receive unsoliciated
commands from DataConnectionTracker back to MobileDataStateTracker.

Change-Id: I3863e7385155d503f069b1dcb7e4f766ec78b5f8
2010-12-07 10:31:02 -08:00
Robert Greenwalt
da3d5e6587 Add a Dummy data connection for testing purposes.
Enable with:
    <string-array translatable="false" name="networkAttributes">
        <item>"wifi,1,1,1"</item>
        <item>"dummy,7,7,0"</item>
    </string-array>

in your config.xml

Change-Id: I3965edaeb4873e95131f4083b8d23d682ce17841
2010-12-07 07:48:33 -08:00
Jean-Baptiste Queru
4c240a2cd1 am 465e88eb: am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '465e88eb008408d4e655ca7bdd9c2b3ac305e54b':
  Changing connect and response timeout.
2010-12-06 16:44:50 -08:00
Jean-Baptiste Queru
1ee2394edd am 1d67fa5b: Merge "Changing connect and response timeout."
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
  Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Henrik Baard
d39fd5a97c Changing connect and response timeout.
In bad network conditions and where switches often occur between 2G and
3G the timeout of 20s is too short.

Setting this timeout to 60 seconds will improve functionality in bad conditions
while it will not affect functionality in good networks. This change also aligns
the timeouts with the timeouts used by the Browser (Connection.java).

Change-Id: I0fbe3cbfe734f8d55a41bfa5d8ab6b332a19f912
2010-12-06 07:57:02 +01:00
Wink Saville
ed9c02b56c Cleanup logging.
Change-Id: Ie73c6d97ec19b0d27e58c085b60e885d90066056
2010-12-03 12:01:38 -08:00
Wink Saville
26f5a384d8 Use apn types instead of host when sending notifications.
Previously we were passing the apn host not the type and this
caused us to sometimes not send out network change notifications.

Also rename of getActivceApn to getActiveApnHost to make
the method clearer on what is being returned and add some debug.

A future change will rename ApnSetting.apn to ApnSetting.host
and getActiveApnString.

bug: 2995554
Change-Id: I0c405b0f823f62c9596968c8516b820d9f8a94f2
2010-11-24 16:44:29 -08:00
Robert Greenwalt
434203a277 Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
2010-11-19 10:24:30 -08:00
Iain Merrick
83d4a23c28 Provide default error strings in BrowserFrame.onReceivedError().
This method is called from both the Android and Chrome HTTP stacks.
We want the same user-facing behaviour in each case, but the Chrome
code does not have easy access to the same error message strings.

Therefore, I'll have the Chrome HTTP stack provide empty strings
for the descriptions. (See change I9042a2ee in external/webkit).

This CL makes BrowserFrame check for empty or null strings and use
the standard error messages instead.

The strings were package-private, so I did a little cleaning up
to make them public (but still hidden from the API). Using a switch
statement instead of an array because it's more robust and should
be comparably efficient.

Bug: 3172265
Test: Load http://google.com:81 to force a timeout error, check
that the correct message is displayed.

Change-Id: I7dec8dffe8ad9e513fdb90877e0b466e707174a8
2010-11-15 11:18:39 +00:00
Huahui Wu
06d8dfd5d1 Merge "b/2864818 use authType for cert verification." 2010-11-09 11:31:26 -08:00
Jesse Wilson
762b33f949 am 2d2f10fa: am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '2d2f10fa3412adc07a08c25ba5d2df600fb654bf':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:26:39 -08:00
Jesse Wilson
2d2f10fa34 am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.
* commit '28c742573ccaeb55c16bc02fb25fdd86b8d1f76a':
  Add @Deprecated to match @deprecated where it's missing.
2010-11-09 10:17:33 -08:00
Jesse Wilson
28c742573c Add @Deprecated to match @deprecated where it's missing.
Change-Id: Ice95022671968386a601f32df7850f9baa1d2dd0
2010-11-09 10:10:11 -08:00