Commit Graph

380 Commits

Author SHA1 Message Date
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -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
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
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
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
17415b9292 Update network subtypes info so it is current.
bug:3327895
Change-Id: Ic1e2a5527c651333af50cc5cfa6c44a15b991fb0
2011-01-14 11:23:54 -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
Huahui Wu
8234bdb36a b/2864818 use authType for cert verification.
Change-Id: I2a3cb963165a7e2e4e72a1d398205b31f769cafa
2010-11-09 09:42:03 -08:00
Huahui Wu
5912f90e60 Merge "Expose the cert validator to JNI." 2010-11-08 21:00:13 -08:00
Huahui Wu
85ffa26f67 Expose the cert validator to JNI.
Change-Id: Ie31919e762b1f528b319c251ccfd891dd7738544
2010-11-08 17:30:17 -08:00
Brian Carlstrom
ee8dd6baf8 Delete used import
Change-Id: Ic950e50565aadafd2575561eb03c8e1e2ff45593
2010-11-08 10:37:19 -08:00
Elliott Hughes
6b7af6055f Use InetAddress.isNumeric.
This code is trying to detect anything equivalent to localhost, but without
accidentally causing a DNS lookup.

Bug: 3073384
Change-Id: Ib611c8ca46059e00b07fc4b94d4af777217da1fb
2010-11-04 16:46:00 -07:00
Elliott Hughes
1693182c02 Remove NetworkUtils.isIpAddress.
Bug: 3073384
Change-Id: I5bd46d1995186c2384c68d0afff3b869f46624c5
2010-11-04 15:27:33 -07:00
Robert Greenwalt
962a990a45 Add some network/phone type constants.
Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
2010-11-03 17:02:37 -07:00
Brian Carlstrom
02ca44b13c Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl
Bug: 2658463
Change-Id: Iaf27e6b37ad4ad3951ecccc17eab64049bbfaac0
2010-10-21 23:19:12 -07:00
Bjorn Bringert
eb8be973c7 Make fields in WebAddress private, add getters/setters
Change-Id: Iceaf3d648289344e53c37273f7324a79676fbef7
2010-10-13 16:21:01 +01:00
Brad Fitzpatrick
f21b4cde18 resolved conflicts for merge of b3ffd4ad to master
Change-Id: I80b227b678ef168a45494acf879debed5861de39
2010-10-11 10:46:01 -07:00
Brad Fitzpatrick
b3ffd4adcc am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"
Merge commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090' into gingerbread-plus-aosp

* commit '3ed792d59cda9f9023201d80f5bdc62d4cef3090':
  Don't perform DNS lookup in android.net.Proxy.isLocalHost
2010-10-10 11:49:43 -07:00
Irfan Sheriff
96ca91761e Use LinkProperties for IP and proxy configuration
Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270
2010-10-08 12:41:11 -07:00
Irfan Sheriff
ed5d7d17c9 Add LinkAddress
LinkAddress stores IP address + prefix for a network link

Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Robert Greenwalt
ba175a5e13 Turn on some debugging info
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Andreas Sandblad
e6b29898b1 Don't perform DNS lookup in android.net.Proxy.isLocalHost
This fixes degrade introduced by:
Switch to using public APIs instead of private ones.
536ff5a6d7

Change-Id: I63cbea82d85d55d933bcfc9e7a311d1aa2324955
2010-10-04 17:59:05 +02:00
Dianne Hackborn
dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master
Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e
2010-09-30 20:34:34 -07:00