OSDN Git Service
Eric Fischer [Sat, 14 Nov 2009 01:58:04 +0000 (17:58 -0800)]
am
9d6b0fa7: Import revised translations. DO NOT MERGE
Merge commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-plus-aosp
* commit '
9d6b0fa777f6978be741f2b34bf36cdec8cb7a41':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 14 Nov 2009 01:26:25 +0000 (17:26 -0800)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Thu, 29 Oct 2009 06:35:16 +0000 (23:35 -0700)]
am
8dcf3cb2: Import revised translations. DO NOT MERGE
Merge commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-plus-aosp
* commit '
8dcf3cb2c499612b42e9eeab9164d5be7c539169':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 29 Oct 2009 04:20:27 +0000 (21:20 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 18:59:07 +0000 (11:59 -0700)]
am
0ac5c77d: Import revised translations. DO NOT MERGE
Merge commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-plus-aosp
* commit '
0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 21 Oct 2009 17:48:59 +0000 (10:48 -0700)]
Import revised translations. DO NOT MERGE
Approver: jerryw
Eric Fischer [Thu, 8 Oct 2009 22:15:58 +0000 (15:15 -0700)]
am
0a6d0804: am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-plus-aosp
* commit '
0a6d08049533bdb769ca229e5205abe9545b46c6':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Oct 2009 22:02:39 +0000 (15:02 -0700)]
am
aad2e29e: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd' into eclair
* commit '
aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Sep 2009 23:45:25 +0000 (16:45 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:09 +0000 (09:53 -0700)]
am
c04b1a0c: Disable unnecessary logging
Merge commit '
c04b1a0c79631ed8804475a1c4b144686bfaab15' into eclair-plus-aosp
* commit '
c04b1a0c79631ed8804475a1c4b144686bfaab15':
Disable unnecessary logging
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:06 +0000 (09:53 -0700)]
am
4a977a52: Re-use the same random value to compute a download\'s restart time.
Merge commit '
4a977a52c3eb3ac08b94b81aef72fb618be39f81' into eclair-plus-aosp
* commit '
4a977a52c3eb3ac08b94b81aef72fb618be39f81':
Re-use the same random value to compute a download's restart time.
Jean-Baptiste Queru [Thu, 24 Sep 2009 16:53:03 +0000 (09:53 -0700)]
am
2061c034: Remove unnecessary logging
Merge commit '
2061c03400a8e23cfeee5394b7e71db2440a48ed' into eclair-plus-aosp
* commit '
2061c03400a8e23cfeee5394b7e71db2440a48ed':
Remove unnecessary logging
Jean-Baptiste Queru [Thu, 24 Sep 2009 14:57:52 +0000 (07:57 -0700)]
Disable unnecessary logging
BUG=
2134410
Jean-Baptiste Queru [Thu, 24 Sep 2009 14:59:02 +0000 (07:59 -0700)]
Re-use the same random value to compute a download's restart time.
The restart time is used multiple times during the same pass,
and it needs to be consistent across calls. Otherwise, it's
possible for a download to not be restarted immediately and
to not be scheduled for a future restart.
BUG=
2055624
Jean-Baptiste Queru [Thu, 24 Sep 2009 15:02:04 +0000 (08:02 -0700)]
Remove unnecessary logging
Also tweak some slightly inaccurate logging, and add a note
about a potential bug.
BUG=
2055624
Jean-Baptiste Queru [Wed, 23 Sep 2009 14:21:15 +0000 (07:21 -0700)]
am
764844eb: Log the service being launched
Merge commit '
764844ebbb788cdde731abbacc89b9afcab8b49f' into eclair-plus-aosp
* commit '
764844ebbb788cdde731abbacc89b9afcab8b49f':
Log the service being launched
Jean-Baptiste Queru [Wed, 23 Sep 2009 01:12:59 +0000 (18:12 -0700)]
Log the service being launched
BUG=
2055624
Jean-Baptiste Queru [Tue, 22 Sep 2009 22:51:09 +0000 (15:51 -0700)]
am
e2607d88: Add a bit more logging to track down network state issues.
Merge commit '
e2607d88081f02a418ff5d5067f5327d513e00a1' into eclair-plus-aosp
* commit '
e2607d88081f02a418ff5d5067f5327d513e00a1':
Add a bit more logging to track down network state issues.
Jean-Baptiste Queru [Tue, 22 Sep 2009 22:28:36 +0000 (15:28 -0700)]
Add a bit more logging to track down network state issues.
BUG=
2055624
Jean-Baptiste Queru [Mon, 21 Sep 2009 17:14:45 +0000 (10:14 -0700)]
am
a581a4af: Add logging to track connectivity as seen from the Download Manager.
Merge commit '
a581a4af046fd82b5854d213519e3f418047c0ba' into eclair-plus-aosp
* commit '
a581a4af046fd82b5854d213519e3f418047c0ba':
Add logging to track connectivity as seen from the Download Manager.
Jean-Baptiste Queru [Mon, 21 Sep 2009 01:51:28 +0000 (18:51 -0700)]
Add logging to track connectivity as seen from the Download Manager.
This is enabled by a separate build-time constant, so that it can
be turned on for everyone without having to use a system property.
BUG=
2055624
Eric Fischer [Thu, 17 Sep 2009 22:15:30 +0000 (15:15 -0700)]
am
7dd04503: Import revised translations. DO NOT MERGE
Merge commit '
7dd04503e767637c0e4f1b4517f613c8b0c79024' into eclair-plus-aosp
* commit '
7dd04503e767637c0e4f1b4517f613c8b0c79024':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:37:26 +0000 (14:37 -0700)]
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 9 Sep 2009 00:11:02 +0000 (17:11 -0700)]
am
1a397667: Import revised translations. DO NOT MERGE
Merge commit '
1a39766751288d3c8d3bd06c812493315067262f' into eclair-plus-aosp
* commit '
1a39766751288d3c8d3bd06c812493315067262f':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 8 Sep 2009 23:32:45 +0000 (16:32 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 4 Sep 2009 14:51:28 +0000 (07:51 -0700)]
merge from open-source master
Jean-Baptiste Queru [Thu, 3 Sep 2009 21:13:17 +0000 (14:13 -0700)]
merge from donut
Eric Fischer [Fri, 28 Aug 2009 00:26:16 +0000 (17:26 -0700)]
DO NOT MERGE: Cherry-picked
5761e46f88aa2f216d8d22288435c497153931c7 from master branch
Armor string format tokens with translation placeholders.
Eric Fischer [Thu, 27 Aug 2009 20:53:48 +0000 (13:53 -0700)]
DO NOT MERGE: cherry-picked
28a3d53eca1fedf9b6ad5513db4bc1834e9d92fa from master branch
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Tom Taylor [Tue, 11 Aug 2009 17:28:10 +0000 (10:28 -0700)]
Add INSTALL_DRM permission
Add new permission to install drm into DrmProvider.
Tom Taylor [Fri, 7 Aug 2009 19:32:49 +0000 (12:32 -0700)]
Revert "Add new the INSERTL_DRM to the Downloader so it can install DRM content."
This reverts commit
f0728f890008a9fe7a79ffdbc30cd3388ce130fc.
Tom Taylor [Fri, 24 Jul 2009 23:46:48 +0000 (16:46 -0700)]
Add new the INSERTL_DRM to the Downloader so it can install DRM content.
Jean-Baptiste Queru [Tue, 4 Aug 2009 16:00:30 +0000 (09:00 -0700)]
merge from open-source master
Eric Fischer [Tue, 4 Aug 2009 00:06:19 +0000 (17:06 -0700)]
am
89d4bc91: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '
89d4bc914ba0250e8d7a3c216e466799a985dd16'
* commit '
89d4bc914ba0250e8d7a3c216e466799a985dd16':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 3 Aug 2009 23:30:42 +0000 (16:30 -0700)]
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Wed, 29 Jul 2009 21:57:07 +0000 (14:57 -0700)]
merge from donut
Jean-Baptiste Queru [Sun, 26 Jul 2009 18:43:56 +0000 (11:43 -0700)]
reconcile korg/master into goog/master
Jean-Baptiste Queru [Sun, 26 Jul 2009 03:44:56 +0000 (20:44 -0700)]
Merge korg/donut into korg/master
Conflicts:
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:14 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Jean-Baptiste Queru [Tue, 14 Jul 2009 22:53:03 +0000 (15:53 -0700)]
am
d3403254: Enable full logging (for easier debugging)
Merge commit '
d3403254c3a290b6a68804c36c6876cb3787ec15'
* commit '
d3403254c3a290b6a68804c36c6876cb3787ec15':
Enable full logging (for easier debugging)
Jean-Baptiste Queru [Tue, 14 Jul 2009 22:11:48 +0000 (15:11 -0700)]
Enable full logging (for easier debugging)
See http://b/
1973844
Eric Fischer [Tue, 14 Jul 2009 04:41:43 +0000 (21:41 -0700)]
Eric Fischer [Mon, 13 Jul 2009 22:54:37 +0000 (15:54 -0700)]
Import new translations
Jean-Baptiste Queru [Mon, 6 Jul 2009 17:42:56 +0000 (10:42 -0700)]
Merge commit '
f0fa1cdc' into manualmerge
Fix crash in discardPurgeableFiles with proper selection syntax.
The basic crash is that this codepath was doing a query to the download
provider without properly quoting its selection arguments (which is
mandated by the download provider).
A secondary crash is that the DESTINATION column wasn't readable.
This fixes bug
1941125.
Tested by force-calling discardPurgeableFiles for each download
to /cache, locally adding a few debugging statements to be sure
that the codepath was getting executed, and doing a market download.
Conflicts:
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
Jean-Baptiste Queru [Wed, 1 Jul 2009 22:27:28 +0000 (15:27 -0700)]
Fix crash in discardPurgeableFiles with proper selection syntax.
The basic crash is that this codepath was doing a query to the download
provider without properly quoting its selection arguments (which is
mandated by the download provider).
A secondary crash is that the DESTINATION column wasn't readable.
This fixes bug
1941125.
Tested by force-calling discardPurgeableFiles for each download
to /cache, locally adding a few debugging statements to be sure
that the codepath was getting executed, and doing a market download.
Android (Google) Code Review [Wed, 17 Jun 2009 04:59:32 +0000 (21:59 -0700)]
am
3c700a35: Merge change 4415 into donut
Merge commit '
3c700a35be5ec8c4036e75abebf0e5d4bc878eff'
* commit '
3c700a35be5ec8c4036e75abebf0e5d4bc878eff':
Make name of Download Provider localizable.
Android (Google) Code Review [Tue, 16 Jun 2009 23:53:04 +0000 (16:53 -0700)]
Merge change 4415 into donut
* changes:
Make name of Download Provider localizable.
Eric Fischer [Tue, 16 Jun 2009 23:34:08 +0000 (16:34 -0700)]
Make name of Download Provider localizable.
Brett Chabot [Tue, 16 Jun 2009 19:26:26 +0000 (12:26 -0700)]
Rename column reference in download provider permission test.
The Android Open Source Project [Tue, 16 Jun 2009 17:09:25 +0000 (10:09 -0700)]
temp fix for build break
Brett Chabot [Tue, 16 Jun 2009 15:37:15 +0000 (08:37 -0700)]
am
8669ad11: Add DownloadProvider permission tests.
Merge commit '
8669ad1117c7502d74ef24e2a7f9df387f5eddd2'
* commit '
8669ad1117c7502d74ef24e2a7f9df387f5eddd2':
Add DownloadProvider permission tests.
Brett Chabot [Mon, 15 Jun 2009 23:36:38 +0000 (16:36 -0700)]
Add DownloadProvider permission tests.
Brett Chabot [Mon, 15 Jun 2009 20:01:19 +0000 (13:01 -0700)]
am
f4d6323d: Add permission test app structure for download provider.
Merge commit '
f4d6323d42524ee6ea19beed8f52efab241e630f'
* commit '
f4d6323d42524ee6ea19beed8f52efab241e630f':
Add permission test app structure for download provider.
Brett Chabot [Mon, 15 Jun 2009 19:27:58 +0000 (12:27 -0700)]
Add permission test app structure for download provider.
Eric Fischer [Wed, 10 Jun 2009 22:32:49 +0000 (15:32 -0700)]
am
cb5486ea: am
aa975b5c: AI 149721: Import Portuguese translations.
Merge commit '
cb5486eae642cbf330591a2af2b84885e4caae67'
* commit '
cb5486eae642cbf330591a2af2b84885e4caae67':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:32:06 +0000 (12:32 -0700)]
am
aa975b5c: AI 149721: Import Portuguese translations.
Merge commit '
aa975b5cd35058678effbf234ae9340aa1413024' into donut
* commit '
aa975b5cd35058678effbf234ae9340aa1413024':
AI 149721: Import Portuguese translations.
Eric Fischer [Wed, 10 Jun 2009 19:26:09 +0000 (12:26 -0700)]
AI 149721: Import Portuguese translations.
Automated import of CL 149721
San Mehat [Mon, 1 Jun 2009 17:02:49 +0000 (10:02 -0700)]
am
8a8f58e9: DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
Merge commit '
8a8f58e913d5dbf592bdff62da1b8ae74f014a64'
* commit '
8a8f58e913d5dbf592bdff62da1b8ae74f014a64':
DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
San Mehat [Mon, 1 Jun 2009 16:26:42 +0000 (09:26 -0700)]
DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
Signed-off-by: San Mehat <san@google.com>
Dianne Hackborn [Sat, 16 May 2009 01:22:33 +0000 (18:22 -0700)]
am
e848c012: Rename SDCARD_WRITE to WRITE_SDCARD.
Merge commit '
e848c012a4549ff77ef1896d690ef663cb3972ca'
* commit '
e848c012a4549ff77ef1896d690ef663cb3972ca':
Rename SDCARD_WRITE to WRITE_SDCARD.
Dianne Hackborn [Wed, 13 May 2009 22:08:51 +0000 (15:08 -0700)]
Rename SDCARD_WRITE to WRITE_SDCARD.
Eric Fischer [Fri, 1 May 2009 01:13:15 +0000 (18:13 -0700)]
am
7788f80: am
4f8a76e: AI 148147: Import lots of zh_TW translation chan
Merge commit '
7788f8030f131fbed6f9281d14d4efcdcc6033de'
* commit '
7788f8030f131fbed6f9281d14d4efcdcc6033de':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:59:45 +0000 (17:59 -0700)]
am
4f8a76e: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
4f8a76e2c7e463c36fbb6bdd16576c9db01a2e78' into donut
* commit '
4f8a76e2c7e463c36fbb6bdd16576c9db01a2e78':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
San Mehat [Wed, 29 Apr 2009 22:17:26 +0000 (15:17 -0700)]
am
cddbe7a: downloadprovider: Add SDCARD_WRITE permission to manifest
Merge commit '
cddbe7a063ff5d39545161bf1751d39269a46467'
* commit '
cddbe7a063ff5d39545161bf1751d39269a46467':
downloadprovider: Add SDCARD_WRITE permission to manifest
The Android Open Source Project [Fri, 24 Apr 2009 20:55:03 +0000 (13:55 -0700)]
Merge commit 'korg/donut'
San Mehat [Thu, 23 Apr 2009 18:51:25 +0000 (11:51 -0700)]
downloadprovider: Add SDCARD_WRITE permission to manifest
Signed-off-by: San Mehat <san@google.com>
Jean-Baptiste Queru [Thu, 23 Apr 2009 01:33:19 +0000 (18:33 -0700)]
Merge donut into master
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:57:00 +0000 (17:57 -0700)]
merge cupcake into donut
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:12:40 +0000 (17:12 -0700)]
Merge donut into master
Eric Fischer [Wed, 15 Apr 2009 20:30:20 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
The Android Open Source Project [Sun, 29 Mar 2009 15:55:26 +0000 (08:55 -0700)]
Merge branch 'open_source' into google_internal
The Android Open Source Project [Fri, 27 Mar 2009 22:39:32 +0000 (15:39 -0700)]
Merge commit 'korg/cupcake'
Conflicts:
src/com/android/providers/downloads/DownloadThread.java
Feng Qian [Wed, 25 Mar 2009 01:21:37 +0000 (18:21 -0700)]
Automated import from //branches/donutburger/...@140733,140733
Feng Qian [Wed, 25 Mar 2009 01:21:37 +0000 (18:21 -0700)]
Automated import from //branches/master/...@140735,140735
The Android Open Source Project [Fri, 20 Mar 2009 06:08:57 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 05:20:27 +0000 (22:20 -0700)]
auto import //branches/master/...@140412
The Android Open Source Project [Thu, 19 Mar 2009 00:39:49 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
Jean-Baptiste Queru [Tue, 17 Mar 2009 23:35:01 +0000 (16:35 -0700)]
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
docs/index.html
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/DownloadService.java
The Android Open Source Project [Mon, 9 Mar 2009 18:52:14 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Wed, 4 Mar 2009 03:32:40 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:53 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:37 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:45 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
Jean-Baptiste Queru [Sat, 28 Feb 2009 01:22:12 +0000 (17:22 -0800)]
Make the DownloadProvider work in the simulator
Android Code Review [Sat, 28 Feb 2009 00:58:50 +0000 (16:58 -0800)]
Merge
Jean-Baptiste Queru [Sat, 28 Feb 2009 00:53:12 +0000 (16:53 -0800)]
Optimize call to queryIntentActivities()
Replace a call to queryIntentActivities() with a calls to
resolveActivity(). This is done since the only purpose of the call
is to check if the returned list is empty or non-empty. It's
inefficient to move an entire list across the process boundary,
only to discard it.
Jean-Baptiste Queru [Fri, 27 Feb 2009 19:30:32 +0000 (11:30 -0800)]
Remove stale uses-permission tag.
That was a leftover of a stub in 1.0 that was meant to become a download UI API
but got struck by bitrot and got deleted in a cleanup.
The Android Open Source Project [Thu, 19 Feb 2009 18:57:36 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Tue, 10 Feb 2009 23:44:05 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
Android Code Review [Mon, 9 Feb 2009 17:57:58 +0000 (09:57 -0800)]
Merge
Jean-Baptiste Queru [Fri, 6 Feb 2009 19:09:27 +0000 (11:09 -0800)]
Refine interaction between destination and default visibility.
The previous code was hard to read, and relied on the fact that one of
the constants was 0 (which is also the default value when reading
back uninitialized columns).
Jean-Baptiste Queru [Fri, 6 Feb 2009 00:33:14 +0000 (16:33 -0800)]
Documentation about the download manager
The Android Open Source Project [Thu, 22 Jan 2009 08:16:15 +0000 (00:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Thu, 22 Jan 2009 08:13:45 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
Dennis Hsieh [Mon, 29 Dec 2008 05:18:07 +0000 (13:18 +0800)]
Force sync the downloaded file to the storage after completion.
This will write the downlaoded file to the storage (sdcard in default).
It can prevent file corruption if the user removes the sdcard unsafely
after a download completes.
Jean-Baptiste Queru [Tue, 20 Jan 2009 19:05:32 +0000 (11:05 -0800)]
Use the new download manager APIs introduced in change 7400
Jean-Baptiste Queru [Tue, 20 Jan 2009 18:08:46 +0000 (10:08 -0800)]
Match the official code style guide.
This fixes a number of style violations that weren't caught by automated
tools and brings those files closer to compliance with the official style
guide for this language.
android-build SharedAccount [Fri, 16 Jan 2009 00:16:09 +0000 (16:16 -0800)]
Merge branch 'cupcake'
The Android Open Source Project [Fri, 16 Jan 2009 00:12:14 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
OSDN Git Service
