Merge commit '34a7f0807ee93eaefe83a9192ebc774fb1560875' into gingerbread-plus-aosp
* commit '34a7f0807ee93eaefe83a9192ebc774fb1560875':
Un-@hide ability to download without a running notification.
This code uses a try/finally to maintain the old behavior of setting
implCreated even if creation fails.
Change-Id: Ieac05568477db4908cd4087714cf00a9addd1d20
Merge commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1' into gingerbread-plus-aosp
* commit 'd2319d8d9a2d2bc5edc9d7d20b7100f4c72cb2e1':
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
Merge commit '478747181e0414d703076d4786b201718cd93d5b' into gingerbread-plus-aosp
* commit '478747181e0414d703076d4786b201718cd93d5b':
Support new URI structure for download provider.
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
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
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp
* commit '405d4db50b3db1fc5e015475218e190d193332d4':
Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
Merge commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0' into gingerbread-plus-aosp
* commit '90fb15a7e52b1208b8d4f7518a61efb99580b5b0':
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
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp
* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
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
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
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp
* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
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
Merge commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6' into gingerbread-plus-aosp
* commit '6b2c56a299eb05deef2b887549e29e9e9f0f2cf6':
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
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp
* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
Fix up handling of null fields in DownloadManager.
Merge commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28' into gingerbread-plus-aosp
* commit 'b3e957bb9d3a3811412e5d94233c7f7e2e777c28':
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
Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp
* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
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
Merge commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625' into gingerbread-plus-aosp
* commit '8e15afe799bbe8d332640c1f2b57b5e0458a9625':
Make downloads visible by default.
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp
* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
Tracking merge of dalvik-dev to gingerbread
Merge commit '7feab3470156c7864fe159115d575c16f0974493' into gingerbread-plus-aosp
* commit '7feab3470156c7864fe159115d575c16f0974493':
Un-@hide new download manager public API.
Merge commit 'b8e07a51c1849d6894c5773a3daacedd01294218' into gingerbread-plus-aosp
* commit 'b8e07a51c1849d6894c5773a3daacedd01294218':
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
Merge commit 'd6343c26b8580f61a257a3045bfa124049201116' into gingerbread-plus-aosp
* commit 'd6343c26b8580f61a257a3045bfa124049201116':
Interface support for custom HTTP headers in DL manager