Commit Graph

234 Commits

Author SHA1 Message Date
Jeff Hamilton
f0cfe3438a Add a few helpful APIs.
Change-Id: Ie57aa71eb77a1e0fb058f4eb6f40d4144a6dfce7
2010-08-10 10:13:18 -05:00
Steve Howard
bd576042a5 am 974c993f: am 8e15afe7: Make downloads visible by default.
Merge commit '974c993fc3771169efa73e40981d18ac0969fac8'

* commit '974c993fc3771169efa73e40981d18ac0969fac8':
  Make downloads visible by default.
2010-08-06 19:06:31 -07:00
Steve Howard
974c993fc3 am 8e15afe7: Make downloads visible by default.
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp

* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
  Make downloads visible by default.
2010-08-06 18:54:03 -07:00
Steve Howard
8e15afe799 Make downloads visible by default.
Change-Id: I8f8b325658d8afc964bddd3f1c03ed20e6bd10aa
2010-08-06 11:06:49 -07:00
Oscar Montemayor
6f71b42bc4 Fix for bug 2890320 Browser crashes, after adding bookmark.
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.

Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
2010-08-05 14:49:28 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b528
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark.
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
2010-08-04 16:07:02 -07:00
Irfan Sheriff
1cf56ab9c6 Avoid hostname lookup in NetworkProperties
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Robert Greenwalt
fa64bcfb01 Merge "Don't reset connections switching default->hipri" 2010-08-03 09:52:48 -07:00
Robert Greenwalt
153b4374d0 Don't reset connections switching default->hipri
A usecase is to use hipri to keep alive 3g connections when wifi
is about to be brought up.  They are the same network, so don't
do the reset unless both are down.

This will go away when we get the deferred network downing.

bug:2865630
Change-Id: I07729b7776fe5ea129120c688cf7839a55a7ed95
2010-08-02 18:13:42 -07:00
Oscar Montemayor
16fb7910fd Global Proxy changes to proxy class.
Change-Id: Ib2da33670b1da33c0b35b60f4fcbd0bc084e616a
2010-08-02 16:29:29 -07:00
Brian Carlstrom
5e8a587d49 Tracking merge of dalvik-dev to master
Change-Id: Id4c19401ad0aa238219aaf5d9a20d2889d0a4b18
2010-07-28 23:49:30 -07:00
Steve Howard
82d0249f5b am 55020622: am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '550206226b59ff116cc677121c82aa61eac966bc'

* commit '550206226b59ff116cc677121c82aa61eac966bc':
  Un-@hide new download manager public API.
2010-07-27 16:59:50 -07:00
Steve Howard
550206226b am 7feab347: Merge "Un-@hide new download manager public API." into gingerbread
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp

* commit '7feab3470156c7864fe159115d575c16f0974493':
  Un-@hide new download manager public API.
2010-07-27 16:37:39 -07:00
Irfan Sheriff
a2a1b911a3 Refactor WifiStateTracker
Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
2010-07-27 11:59:29 -07:00
Steve Howard
46be2a5bb6 Un-@hide new download manager public API.
Change-Id: Ia8433160ef40e25fb9408f05f97c7bbfa10a807e
2010-07-26 20:44:35 -07:00
Jean-Baptiste Queru
14d9c34ccb am c7ab09ed: Merge "Fix build."
Merge commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b' into gingerbread-plus-aosp

* commit 'c7ab09ede5426f1ca7f1215aa4d7ac95a2b6109b':
  Fix build.
2010-07-26 10:05:23 -07:00
Steve Howard
a265083890 am 5e43c5a6: am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746'

* commit '5e43c5a6e8f94134850c7e3bc4c7f657e1579746':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:27:02 -07:00
Steve Howard
5e43c5a6e8 am b8e07a51: DL manager support for broadcasts + connectivity control
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp

* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
  DL manager support for broadcasts + connectivity control
2010-07-21 21:22:58 -07:00
Steve Howard
b8e07a51c1 DL manager support for broadcasts + connectivity control
* Additions to DownloadManager to support control of broadcast intents, allowed network types, and roaming control.  This includes new constants and added implementation.
* New DB columns to hold connectivity flags and one to indicate whether the download was initiated through the public API; this is used to change behavior related to broadcast intents and connectivity controls.

Change-Id: I2e8e4ce92cde7889a0f24dc43b86c596c73c0eaa
2010-07-21 19:09:35 -07:00
Jean-Baptiste Queru
536ff5a6d7 Fix build.
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
2010-07-16 15:30:40 -07:00
Jean-Baptiste Queru
cc0aad38f0 Fix build.
Switch to using public APIs instead of private ones.

Change-Id: Ia3468d94b3dadeb6a000ce419ee08f7e7ba5dc67
2010-07-16 15:18:56 -07:00
The Android Open Source Project
a508668309 am c9ecd445: merge from open-source master
Merge commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e'

* commit 'c9ecd445b86552265b4adb90e5df2fbe5f71cb8e':
  Added method getPreferredHttpHost
2010-07-16 14:01:43 -07:00
The Android Open Source Project
c9ecd445b8 merge from open-source master
Change-Id: I6bdeeff30be1fdb0901aec9bcdd67176c29eaf7b
2010-07-16 13:58:43 -07:00
The Android Open Source Project
62dfcf38b5 am 3b97e5a6: merge from open-source master
Merge commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe'

* commit '3b97e5a6270f40111117c4d3f1e964154ddea0fe':
  Make HTTP Header class handle multiple cache-control fields.
2010-07-16 13:52:45 -07:00
The Android Open Source Project
3b97e5a627 merge from open-source master
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
2010-07-16 13:48:39 -07:00
Robert Greenwalt
0a0ba099ed Fix Emulator boot.
Catch a NPE that doesn't seem to happen on devices.

Change-Id: I47d599afbed76798d8d312a59e30b89664363e93
2010-07-15 15:51:48 -07:00
Steve Howard
9db328463a am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit '203ec9fa6eab21621969f36053d4cd59c23977a9'

* commit '203ec9fa6eab21621969f36053d4cd59c23977a9':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:31:29 -07:00
Steve Howard
203ec9fa6e am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" into gingerbread
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp

* commit 'd6343c26b8580f61a257a3045bfa124049201116':
  Interface support for custom HTTP headers in DL manager
2010-07-15 12:28:39 -07:00
Steve Howard
d6343c26b8 Merge "Interface support for custom HTTP headers in DL manager" into gingerbread 2010-07-15 12:24:14 -07:00
Romain Guy
3fb33c7262 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Steve Howard
ea9147df00 Interface support for custom HTTP headers in DL manager
* constants for new DB table, keys for including headers in a
  DownloadProvider.insert() call, and new URIs for retrieving headers
* support in DownloadManager to pass headers to the provider
2010-07-15 10:22:50 -07:00
Andrew Stadler
5ba2e74560 am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory
2010-07-14 23:16:25 -07:00
Andrew Stadler
521e9aa752 am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9' into gingerbread-plus-aosp

* commit 'c98e431119867dbc4ae3da52d5c374607c0f67b9':
  Skip hostname verification when using insecure factory
2010-07-14 22:39:19 -07:00
Andrew Stadler
c98e431119 am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo
Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory
2010-07-14 22:33:42 -07:00
Steve Howard
756088482f am 57de95a5: am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '57de95a51ff5d98fcad0a7735c496be5f647d66f'

* commit '57de95a51ff5d98fcad0a7735c496be5f647d66f':
  Download manager support for file URIs + last modified time
2010-07-14 11:25:32 -07:00
Steve Howard
57de95a51f am 05940b2c: Merge "Download manager support for file URIs + last modified time" into gingerbread
Merge commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c' into gingerbread-plus-aosp

* commit '05940b2c04041d6b3b8d222f4acfd12faeeb6c9c':
  Download manager support for file URIs + last modified time
2010-07-14 11:22:20 -07:00
Robert Greenwalt
26dd7b3bb3 Merge "Pass network properties to ConnectivityService." 2010-07-14 09:09:31 -07:00
Andreas Sandblad
2986f858ae Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.

Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
2010-07-14 08:49:46 +02:00
Henrik Baard
c692e8c4da Make HTTP Header class handle multiple cache-control fields.
The HTTP specification states the following about the fields:
Multiple message-header fields with the same field-name MAY be present
in a message if and only if the entire field-value for that header field
is defined as a comma-separated list [i.e., #(values)]. It MUST be
possible to combine the multiple header fields into one "field-name:
field-value" pair, without changing the semantics of the message, by
appending each subsequent field-value to the first, each separated by a
comma. The order in which header fields with the same field-name are
received is therefore significant to the interpretation of the combined
field value, and thus a proxy MUST NOT change the order of these field
values when a message is forwarded.

Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
2010-07-14 08:20:40 +02:00
Steve Howard
adcb697826 Download manager support for file URIs + last modified time
First, in the download manager public API, I'm changing
COLUMN_REQUESTED_TIMESTAMP to COLUMN_LAST_MODIFIED_TIMESTAMP, a field
that already exists in the download manager.  Upon inspection of
existing users of this field, it looks like there are some good use
cases -- for instance, looking at when a download completed.  And if
I'm exposing that timestamp, there's no need to also expose the
requested timestamp.

Second, this change includes support for file URI destinations:

* add DESTINATION_FILE_URI for use by the DownloadManager wrapper
* make DownloadManager use it appropriately

The backend support is in a separate change (since it's in a separate
project).

Also fixing a bug with file URI construction when DownloadManager
fills in COLUMN_LOCAL_URI.

Change-Id: I5bb93a222cd23215c2a03ed9f68d7f140454f7f2
2010-07-13 18:31:41 -07:00
Robert Greenwalt
47f69fe299 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
Steve Howard
4c14a0f13f am 47b46648: am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread
Merge commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1'

* commit '47b46648b5a9b8c518b96db37618fc49c5e5f2d1':
  Initial implementation of the download manager public API.
2010-07-13 13:05:43 -07:00
Steve Howard
47b46648b5 am b8d890eb: Merge "Initial implementation of the download manager public API." into gingerbread
Merge commit 'b8d890ebc1923d98d19d24f396442c91eb766b16' into gingerbread-plus-aosp

* commit 'b8d890ebc1923d98d19d24f396442c91eb766b16':
  Initial implementation of the download manager public API.
2010-07-13 13:03:20 -07:00
Steve Howard
a270936066 Initial implementation of the download manager public API.
The implementation is in android.net.DownloadManager, which is
obtained through Context.getSystemService().  Right now this class
acts as a simple wrapper on top of the existing DownloadProvider,
exposing a simple interface to a subset of DownloadProvider's
functionality.  There are several TODOs for features that require
changes to the underlying download manager implementation.

Change-Id: I2f26e51b60b6e82af8478ac7ccd895667df095b6
2010-07-13 11:12:16 -07:00
Andrew Stadler
df27c0c262 Skip hostname verification when using insecure factory
If the factory was obtained by calling getInsecure(), calls to
createSocket() should skip hostname verification (along with all of the
other skipped safety checks.)

This change slightly relaxes the too-strict checking that was introduced
in change 7fc93c36ae.

Bug: 2834174
Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
2010-07-12 15:31:40 -07:00
Doug Zongker
9ae3f66f14 am 6db0ef09: am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb'

* commit '6db0ef09c4a8b7c1842fc08d37c62692f4f91ebb':
  Verify hostname where possible, and clarify where not.
2010-06-30 15:48:33 -07:00
Doug Zongker
6db0ef09c4 am 24c737cc: am d581484e: Merge "Verify hostname where possible, and clarify where not." into froyo
Merge commit '24c737ccdd64475178d53677f90a300fcfbab79f' into gingerbread-plus-aosp

* commit '24c737ccdd64475178d53677f90a300fcfbab79f':
  Verify hostname where possible, and clarify where not.
2010-06-30 15:33:04 -07:00