Commit Graph

359 Commits

Author SHA1 Message Date
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
Dianne Hackborn
6a3eddb469 am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread
Merge commit '0a69f597604254bc37721b135ab612eaacdd0cbd' into gingerbread-plus-aosp

* commit '0a69f597604254bc37721b135ab612eaacdd0cbd':
  Rub in a little 'ol log-b-gone.
2010-09-30 19:12:11 -07:00
Dianne Hackborn
cef65eeb03 Rub in a little 'ol log-b-gone.
Mmmmmm...  great fresh scent!

Change-Id: I050e70b31b5d4a9c6731f15a4b51a3620a33a78d
2010-09-30 18:27:22 -07:00
Steve Howard
d58429f9ac Manual merge: Move DownloadManager to android.app
Changing package at hackbod's request.

Change-Id: I867017b6a9f4684d30c6c5bd1b07f9cabecddb9f
2010-09-28 17:28:43 -07:00
Steve Howard
9d9719c44a am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread
Merge commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399' into gingerbread-plus-aosp

* commit '5bdb89d7ac20d4d3e71660d7fe78002a63900399':
  Move DownloadManager to android.app (DO NOT MERGE)
2010-09-28 12:41:42 -07:00
Steve Howard
31fd85f39b Move DownloadManager to android.app (DO NOT MERGE)
Changing package at hackbod's request.  I'll merge this manually, as
there's some additional master-only code that will be to be
simultaneously changed.

Change-Id: Ibb629ec1c31807fbee31e0193c6a941d04be0117
2010-09-27 17:12:47 -07:00
Irfan Sheriff
1beeab70a2 Merge "use hostname when address null ProxyProperties parcelling" 2010-09-27 16:24:23 -07:00
Irfan Sheriff
798ffa1237 use hostname when address null ProxyProperties parcelling
In ProxyProperties parcel, use toString so that hostname
is used when address is null

Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8
2010-09-27 12:16:11 -07:00
Steve Howard
e9d51c4e88 am ffe47726: am e78fc18b: Intent action to launch downloads UI.
Merge commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f'

* commit 'ffe477263c503ce75d609d5360cf5e0c72a1363f':
  Intent action to launch downloads UI.
2010-09-24 16:02:45 -07:00
Steve Howard
ffe477263c am e78fc18b: Intent action to launch downloads UI.
Merge commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33' into gingerbread-plus-aosp

* commit 'e78fc18b339bfe2915e61aef2013a17f0a9ede33':
  Intent action to launch downloads UI.
2010-09-24 15:51:50 -07:00
Steve Howard
e78fc18b33 Intent action to launch downloads UI.
Change-Id: Ifd21b9b916479062d51e60108d16ce3f46b453a5
2010-09-24 15:43:51 -07:00
Robert Greenwalt
f333123d50 resolved conflicts for merge of 2d457a32 to master
Change-Id: I08fc7881010083407a102f471483cd6d5b9774b4
2010-09-24 14:47:06 -07:00
Robert Greenwalt
2d457a32a6 am 8f97fe55: Merge "Move long Connectivity tasks to handler thread." into gingerbread
Merge commit '8f97fe551e7bd95abf395eed303b975eaa8f0158' into gingerbread-plus-aosp

* commit '8f97fe551e7bd95abf395eed303b975eaa8f0158':
  Move long Connectivity tasks to handler thread.
2010-09-24 11:09:29 -07:00
Robert Greenwalt
8f97fe551e Merge "Move long Connectivity tasks to handler thread." into gingerbread 2010-09-24 10:42:46 -07:00
Robert Greenwalt
8dcc28be06 Move long Connectivity tasks to handler thread.
Reduce ANR potential.
bug:2942829

Change-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1
2010-09-23 16:43:21 -07:00
Steve Howard
9c7bec2538 am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:11:19 -07:00
Steve Howard
1c134d5559 am 8449490a: am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a'

* commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a':
  Tweaks to download manager API based on API review feedback
2010-09-23 13:10:58 -07:00
Steve Howard
1fd1129264 am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:02:21 -07:00
Steve Howard
8449490a94 am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3' into gingerbread-plus-aosp

* commit '4f564cdeb8478f1a20263fc036c74cc4a63145c3':
  Tweaks to download manager API based on API review feedback
2010-09-23 12:50:07 -07:00
Steve Howard
bb0d23b547 Have DownloadManager pass file URIs for legacy external downloads
DownloadManager was set up to return file URIs for public API
downloads to external, but to return content URIs for all others.
This included browser downloads, which are on external but don't go
through the public API.  Since the new downloads UI uses
DownloadManager, it was affected by this change when the user opened a
file from the UI.  Apparently numerous things don't handle content
URIs well, including music preview (clicking on downloaded mp3) and
package installer (clicking on downloaded APK), so this change makes
it generate file URIs for legacy external downloads.

Change-Id: I5c34d8ba188cc8b0d11865262cb451208be78eae
2010-09-23 12:45:28 -07:00
Steve Howard
4f564cdeb8 Tweaks to download manager API based on API review feedback
* improved documentation of the default destination on the download
  cache and the concomitant consequences

* removed NETWORK_WIMAX flag for setting allowed networks

* changed request headers behavior to support multiple instances of
  the same header (as allowed in the HTTP spec), renamed
  setRequestHeader() to addRequestHeader()

* accept user-facing strings as CharSequences instead of Strings

* new convenience methods setDestinationInExternalFilesDir() and
  setDestinationInExternalPublicDir() for setting a destination in
  either shared or app-private external storage directories

* renamed setMediaType() to setMimeType()

Change-Id: I8781e2214d939c340209cab917bbbba264ab919c
2010-09-23 12:42:34 -07:00
Steve Howard
d0f533ec0a am 8bf158f6: am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e'

* commit '8bf158f6ba31efd2f262fc3ba6cdd13733c7d99e':
  Un-@hide ability to download without a running notification.
2010-09-21 15:07:15 -07:00