Commit Graph

236 Commits

Author SHA1 Message Date
Steve Howard
8bf158f6ba am 34a7f080: Merge "Un-@hide ability to download without a running notification." into gingerbread
Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp

* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
  Un-@hide ability to download without a running notification.
2010-09-21 15:02:53 -07:00
Steve Howard
3104775b53 Un-@hide ability to download without a running notification.
Change-Id: Iaf4d86f05e1f98a894a480d7e2e0ecabb42116c4
2010-09-21 14:18:19 -07:00
Jesse Wilson
2121ec9bca am 8217eac0: Merge "Fix double-checked locking bug in LocalSocket." into gingerbread
Merge commit '8217eac0a0b6d394139eefa85d5f467240427e98' into gingerbread-plus-aosp

* commit '8217eac0a0b6d394139eefa85d5f467240427e98':
  Fix double-checked locking bug in LocalSocket.
2010-09-21 10:33:53 -07:00
Jesse Wilson
8217eac0a0 Merge "Fix double-checked locking bug in LocalSocket." into gingerbread 2010-09-21 10:30:39 -07:00
Jesse Wilson
c59a662382 Fix double-checked locking bug in LocalSocket.
This code uses a try/finally to maintain the old behavior of setting
implCreated even if creation fails.

Change-Id: Ieac05568477db4908cd4087714cf00a9addd1d20
2010-09-21 10:26:57 -07:00
Steve Howard
4735be0211 am d2319d8d: Merge "New error status for "destination file already exists"." into gingerbread
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp

* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
  New error status for "destination file already exists".
2010-09-20 15:43:43 -07:00
Steve Howard
a9e87c9cc3 New error status for "destination file already exists".
Also changing the behavior of the local URI column slightly to better
match the spec -- it should return the client-provided destination so
that it's valid even if the download failed.

Change-Id: Ibf9c07519e647e677ebac8b334b9f2e930e47033
2010-09-20 13:44:51 -07:00
Steve Howard
4cd34abe53 am 47874718: Merge "Support new URI structure for download provider." into gingerbread
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp

* commit '478747181e0414d703076d4786b201718cd93d5b':
  Support new URI structure for download provider.
2010-09-16 13:45:51 -07:00
Steve Howard
478747181e Merge "Support new URI structure for download provider." into gingerbread 2010-09-16 13:42:34 -07:00
Robert Greenwalt
f434dd1660 am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp

* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
  Update Inet Connection Status display
2010-09-15 18:02:59 -07:00
Robert Greenwalt
134b28a7f0 Merge "Update Inet Connection Status display" into gingerbread 2010-09-15 17:59:54 -07:00
Robert Greenwalt
1e9aac2bd8 Update Inet Connection Status display
Cellular signal strength should also be green - these assets aren't, but
the art guys are working on that.

Also using a new intent so we don't overload the CONNECTIVITY_ACTION and
confuse the apps.
bug:2994024

Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8
2010-09-15 17:54:17 -07:00
Steve Howard
eca77fcdc6 Support new URI structure for download provider.
I'm changing the URI structure for the download provider a bit.  The
download provider will now support two views into its data:

* content://downloads/my_downloads... will basically be the current
  view, which is limited to downloads owned by the calling UID
* content://downloads/all_downloads... will include all downloads in
  the system, but will require special permission

In addition to making things more clear, this change will allow for
granting URI permissions to individual downloads via the
/all_downloads/... URI.

This change includes the framework changes necessary to support the
new structure.  The bulk of the work will be in the DownloadProvider
code itself.

In addition, this change makes DownloadManager return a content URI
rather than a file URI for /cache downloads.  This avoids any
confusion in clients, which wouldn't be able to open the file
directly, and better supports granting permissions to viewers.

Change-Id: Ie548b927817ac774111990dd0c9d26aaf979d1ea
2010-09-15 12:28:31 -07:00
Brian Carlstrom
e68f8b7ebe am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
2010-09-14 11:29:57 -07:00
Brian Carlstrom
405d4db50b Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
2010-09-14 11:24:13 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Steve Howard
f353daa03a am 90fb15a7: Support UI visibility and restarting in download manager.
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp

* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
  Support UI visibility and restarting in download manager.
2010-09-12 19:11:08 -07:00
Steve Howard
90fb15a7e5 Support UI visibility and restarting in download manager.
First, this change adds a column to the downloads table specifying
whether a download should be displayed in the system downloads UI.  It
adds a public method to set this parameter when requesting a download,
and a hidden method to filter queries based on this paramter (such
filtering could be made public later, but it's not strictly necessary
right now).

Second, this change adds support for restarting a completed/failed
download as a hidden method on DownloadManager.  Currently it only
works from the download manager's process - it'll be used by the new
download manager UI.

Change-Id: I15eda1a6e3717d1ce947a810b25ad3540cce809e
2010-09-12 18:58:55 -07:00
Steve Howard
1ed20dc43b am e3692d15: Merge "Hidden API to control sorting of download manager queries." into gingerbread
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp

* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
  Hidden API to control sorting of download manager queries.
2010-09-09 11:26:08 -07:00
Steve Howard
f054e190bb Hidden API to control sorting of download manager queries.
This change adds a hidden API to sort download manager queries by size
rather than by time last modified.  This is necessary for the system
download manager UI but, in the interest of keeping the new public API
as minimal as possible for now, I'm leaving @hide on this method.

This change also changes the DownloadManager.COLUMN_ID column to be
identical to BaseColumns._ID, since some code relies on this (such as
CursorAdapter).

Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
2010-09-09 11:14:20 -07:00
Robert Greenwalt
ec52c98d44 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
d7085fcf65 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
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
2010-08-25 17:48:47 -07:00
Robert Greenwalt
2b05a95bcc 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
8afddad7e7 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
9bc709d46e 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
Robert Greenwalt
4600139173 am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp

* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
  DO NOT MERGE Do not kill sockets going default->hipri
2010-08-18 15:14:31 -07:00
Robert Greenwalt
6b2c56a299 Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread 2010-08-18 15:11:52 -07:00
Robert Greenwalt
a22ae073cc DO NOT MERGE Do not kill sockets going 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
reset unless both are down.

Change-Id: I8dabc42f315943b28ea34721793b0ee330c07bf6
2010-08-18 15:03:46 -07:00
Steve Howard
0899e8bc9d am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
2010-08-18 13:38:42 -07:00
Steve Howard
8651bd5d18 Fix up handling of null fields in DownloadManager.
Document fields that can have invalid/unknown values, and fix handling
of null local URI.

Change-Id: I7684c151f0a20c91340655246bec2ce0a60328e4
2010-08-17 14:10:25 -07:00
Steve Howard
ab59914de7 am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp

* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
  New download manager error code when we can't resume.
2010-08-17 08:27:17 -07:00
Steve Howard
33bbd12a05 New download manager error code when we can't resume.
Adding DownloadManager.ERROR_CANNOT_RESUME for when we can't resume an
interrupted download (because the server didn't provide an ETag or
doesn't support range requests), as well as the necessary private
status code in Downloads.Impl.

Change-Id: I5a66f1e1964198552ab2216aa6d3cc0db2254e21
2010-08-16 14:28:17 -07:00
Robert Greenwalt
993f85f319 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
b738fb9938 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
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
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
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
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
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
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
3b97e5a627 merge from open-source master
Change-Id: Ic91d205e7fd6a71320d9a4498643d384397dfb00
2010-07-16 13:48:39 -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