summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ↵eclairSteve Kondik2010-05-102-4/+5
|\ | | | | | | | | | | | | git://android.git.kernel.org/platform/packages/providers/DownloadProvider into eclair Conflicts: src/com/android/providers/downloads/DownloadThread.java
| * code left opened files behindusul2010-05-101-1/+13
| | | | | | | | | | | | | | verified with lsof DownloadProvider after downloading a file shows: ${proc} 338 10034 33w REG 179,0 167634 5 /sdcard/download/fw4-1.pdf Change-Id: I8e2412fe9a6348f5ece6f5ca3a9ebf99a4474bce
| * Merge "Show correct date for downloads in the statusbar"Jean-Baptiste Queru2010-05-101-2/+1
| |\
| | * Show correct date for downloads in the statusbarPer Edelberg2010-02-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The date was not set properly in notifications when the text for expanded view was created. This fix sets the displayed time to the download time for each individual file. The DownloadProvider recreates the notifications several times but don't set the time before the expanded message is created. The expanded message will therefore display the time the notification was created and not the time a file was downloaded. The displayed time will in most case be the time when the last file was downloaded. This fix sets the displayed time to the downloaded time for each individual file.
| * | am 7f75be7e: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7f75be7ea7027a2ad6e7564195333fd075c0b1a0' into eclair-plus-aosp * commit '7f75be7ea7027a2ad6e7564195333fd075c0b1a0': android-2.1_r1 snapshot
| * \ \ am a61606af: Import revised translations. DO NOT MERGEEric Fischer2009-11-301-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53' into eclair-plus-aosp * commit 'a61606af5d154cd6281bd5f5de9e01e7240cca53': Import revised translations. DO NOT MERGE
| * \ \ \ merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Merge commit 'goog/stage-korg-master' into HEAD
| | * | | merge from eclairJean-Baptiste Queru2009-11-1528-72/+105
| | |\ \ \
| * | \ \ \ am 9d6b0fa7: Import revised translations. DO NOT MERGEEric Fischer2009-11-131-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41' into eclair-plus-aosp * commit '9d6b0fa777f6978be741f2b34bf36cdec8cb7a41': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ am 8dcf3cb2: Import revised translations. DO NOT MERGEEric Fischer2009-10-281-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169' into eclair-plus-aosp * commit '8dcf3cb2c499612b42e9eeab9164d5be7c539169': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ am 0ac5c77d: Import revised translations. DO NOT MERGEEric Fischer2009-10-213-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4' into eclair-plus-aosp * commit '0ac5c77d8fa81cbdd10dac48f927e0886f2c5da4': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ am 0a6d0804: am aad2e29e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-080-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0a6d08049533bdb769ca229e5205abe9545b46c6' into eclair-plus-aosp * commit '0a6d08049533bdb769ca229e5205abe9545b46c6': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ am c04b1a0c: Disable unnecessary loggingJean-Baptiste Queru2009-09-241-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c04b1a0c79631ed8804475a1c4b144686bfaab15' into eclair-plus-aosp * commit 'c04b1a0c79631ed8804475a1c4b144686bfaab15': Disable unnecessary logging
| * \ \ \ \ \ \ \ \ \ am 4a977a52: Re-use the same random value to compute a download\'s restart time.Jean-Baptiste Queru2009-09-241-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4a977a52c3eb3ac08b94b81aef72fb618be39f81' into eclair-plus-aosp * commit '4a977a52c3eb3ac08b94b81aef72fb618be39f81': Re-use the same random value to compute a download's restart time.
| * \ \ \ \ \ \ \ \ \ \ am 2061c034: Remove unnecessary loggingJean-Baptiste Queru2009-09-243-58/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2061c03400a8e23cfeee5394b7e71db2440a48ed' into eclair-plus-aosp * commit '2061c03400a8e23cfeee5394b7e71db2440a48ed': Remove unnecessary logging
| * \ \ \ \ \ \ \ \ \ \ \ am 764844eb: Log the service being launchedJean-Baptiste Queru2009-09-231-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '764844ebbb788cdde731abbacc89b9afcab8b49f' into eclair-plus-aosp * commit '764844ebbb788cdde731abbacc89b9afcab8b49f': Log the service being launched
| * \ \ \ \ \ \ \ \ \ \ \ \ am e2607d88: Add a bit more logging to track down network state issues.Jean-Baptiste Queru2009-09-223-11/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e2607d88081f02a418ff5d5067f5327d513e00a1' into eclair-plus-aosp * commit 'e2607d88081f02a418ff5d5067f5327d513e00a1': Add a bit more logging to track down network state issues.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am a581a4af: Add logging to track connectivity as seen from the Download ↵Jean-Baptiste Queru2009-09-213-0/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manager. Merge commit 'a581a4af046fd82b5854d213519e3f418047c0ba' into eclair-plus-aosp * commit 'a581a4af046fd82b5854d213519e3f418047c0ba': Add logging to track connectivity as seen from the Download Manager.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7dd04503: Import revised translations. DO NOT MERGEEric Fischer2009-09-1720-100/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7dd04503e767637c0e4f1b4517f613c8b0c79024' into eclair-plus-aosp * commit '7dd04503e767637c0e4f1b4517f613c8b0c79024': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1a397667: Import revised translations. DO NOT MERGEEric Fischer2009-09-0820-270/+307
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1a39766751288d3c8d3bd06c812493315067262f' into eclair-plus-aosp * commit '1a39766751288d3c8d3bd06c812493315067262f': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-09-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge from donutJean-Baptiste Queru2009-09-0320-271/+269
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Allow any file type to be downloadedEddie Ringle2010-04-242-62/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eddie Ringle <eddie@eringle.net>
* | | | | | | | | | | | | | | | | | | code left opened files behindusul2010-03-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verified with lsof DownloadProvider after downloading a file shows: ${proc} 338 10034 33w REG 179,0 167634 5 /sdcard/download/fw4-1.pdf Change-Id: I8e2412fe9a6348f5ece6f5ca3a9ebf99a4474bce
* | | | | | | | | | | | | | | | | | | Don't try to purge the dalvik-cache directory on /cache.Steve Kondik2010-03-092-4/+7
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
|/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | android-2.1_r1 snapshotThe Android Open Source Project2010-01-122-5/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | eclair snapshotJean-Baptiste Queru2009-11-1232-539/+621
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-11-301-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-11-131-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Approver: jerryw
* | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-10-281-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-10-213-3/+3
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Approver: jerryw
* | | | | | | | | | | | am aad2e29e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd' into eclair * commit 'aad2e29eb56d6861c4e6672c18f03b6e00f3b9dd': Import revised translations. DO NOT MERGE
| * | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2009-09-2911-25/+14
| |/ / / / / / / / / /
* | | | | | | | | | / Disable unnecessary loggingJean-Baptiste Queru2009-09-241-3/+3
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=2134410
* | | | | | | | | | Re-use the same random value to compute a download's restart time.Jean-Baptiste Queru2009-09-241-1/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Remove unnecessary loggingJean-Baptiste Queru2009-09-243-58/+3
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also tweak some slightly inaccurate logging, and add a note about a potential bug. BUG=2055624
* | | | | | | | Log the service being launchedJean-Baptiste Queru2009-09-221-0/+14
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | BUG=2055624
* | | | | | | Add a bit more logging to track down network state issues.Jean-Baptiste Queru2009-09-223-11/+51
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | BUG=2055624
* | | | | | Add logging to track connectivity as seen from the Download Manager.Jean-Baptiste Queru2009-09-213-0/+41
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Import revised translations. DO NOT MERGEEric Fischer2009-09-1720-100/+50
| |_|_|/ |/| | |
* | | | Import revised translations. DO NOT MERGEEric Fischer2009-09-0820-270/+307
| |/ / |/| |
* | | DO NOT MERGE: Cherry-picked 5761e46f88aa2f216d8d22288435c497153931c7 from ↵Eric Fischer2009-08-281-2/+2
| | | | | | | | | | | | | | | | | | master branch Armor string format tokens with translation placeholders.
* | | DO NOT MERGE: cherry-picked 28a3d53eca1fedf9b6ad5513db4bc1834e9d92fa from ↵Eric Fischer2009-08-281-1/+1
| | | | | | | | | | | | | | | | | | master branch Fix strings whose apostrophes were eaten because of the lack of a backslash.
* | | Add INSTALL_DRM permissionTom Taylor2009-08-111-2/+3
| | | | | | | | | | | | Add new permission to install drm into DrmProvider.
* | | Revert "Add new the INSERTL_DRM to the Downloader so it can install DRM ↵Tom Taylor2009-08-071-3/+2
| | | | | | | | | | | | | | | | | | content." This reverts commit f0728f890008a9fe7a79ffdbc30cd3388ce130fc.
* | | Add new the INSERTL_DRM to the Downloader so it can install DRM content.Tom Taylor2009-08-041-2/+3
| | |
* | | merge from open-source masterJean-Baptiste Queru2009-08-040-0/+0
|\ \ \ | | |/ | |/|
| * | merge from donutJean-Baptiste Queru2009-07-2921-37/+255
| |\ \