summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am 89d4bc91: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2009-08-030-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Merge commit '89d4bc914ba0250e8d7a3c216e466799a985dd16' * commit '89d4bc914ba0250e8d7a3c216e466799a985dd16': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2009-08-0320-271/+269
| | |/ | |/|
* | | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \ \ | | |/ | |/|
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-2512-10/+226
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/com/android/providers/downloads/DownloadProvider.java src/com/android/providers/downloads/Helpers.java
* | | | Merge commit 'goog/readonly-korg-master' into merge_korg_masterJean-Baptiste Queru2009-07-140-0/+0
|\| | |
| * | | Merge commit 'korg/donut'The Android Open Source Project2009-04-241-1/+1
| |\ \ \
* | \ \ \ am d3403254: Enable full logging (for easier debugging)Jean-Baptiste Queru2009-07-141-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd3403254c3a290b6a68804c36c6876cb3787ec15' * commit 'd3403254c3a290b6a68804c36c6876cb3787ec15': Enable full logging (for easier debugging)
| * | | | Enable full logging (for easier debugging)Jean-Baptiste Queru2009-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | See http://b/1973844
* | | | | am 54a01c2a: Import new translationsEric Fischer2009-07-1320-36/+254
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54a01c2a105383d9fc17e08151eab45531a0bd81' * commit '54a01c2a105383d9fc17e08151eab45531a0bd81': Import new translations
| * | | | Import new translationsEric Fischer2009-07-1320-36/+254
| | |_|/ | |/| |
* | | | Merge commit 'f0fa1cdc' into manualmergeJean-Baptiste Queru2009-07-063-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix crash in discardPurgeableFiles with proper selection syntax.Jean-Baptiste Queru2009-07-023-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | am 3c700a35: Merge change 4415 into donutAndroid (Google) Code Review2009-06-162-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3c700a35be5ec8c4036e75abebf0e5d4bc878eff' * commit '3c700a35be5ec8c4036e75abebf0e5d4bc878eff': Make name of Download Provider localizable.
| * | | Merge change 4415 into donutAndroid (Google) Code Review2009-06-162-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * changes: Make name of Download Provider localizable.
| | * | | Make name of Download Provider localizable.Eric Fischer2009-06-162-1/+4
| | | | |
* | | | | Rename column reference in download provider permission test.Brett Chabot2009-06-161-1/+1
| | | | |
* | | | | temp fix for build breakThe Android Open Source Project2009-06-161-1/+1
| | | | |
* | | | | am 8669ad11: Add DownloadProvider permission tests.Brett Chabot2009-06-162-29/+116
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8669ad1117c7502d74ef24e2a7f9df387f5eddd2' * commit '8669ad1117c7502d74ef24e2a7f9df387f5eddd2': Add DownloadProvider permission tests.
| * | | | Add DownloadProvider permission tests.Brett Chabot2009-06-152-29/+116
| | | | |
* | | | | am f4d6323d: Add permission test app structure for download provider.Brett Chabot2009-06-154-0/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f4d6323d42524ee6ea19beed8f52efab241e630f' * commit 'f4d6323d42524ee6ea19beed8f52efab241e630f': Add permission test app structure for download provider.
| * | | | Add permission test app structure for download provider.Brett Chabot2009-06-154-0/+92
| |/ / /
* | | | am cb5486ea: am aa975b5c: AI 149721: Import Portuguese translations.Eric Fischer2009-06-101-0/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cb5486eae642cbf330591a2af2b84885e4caae67' * commit 'cb5486eae642cbf330591a2af2b84885e4caae67': AI 149721: Import Portuguese translations.
| * | | am aa975b5c: AI 149721: Import Portuguese translations.Eric Fischer2009-06-101-0/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'aa975b5cd35058678effbf234ae9340aa1413024' into donut * commit 'aa975b5cd35058678effbf234ae9340aa1413024': AI 149721: Import Portuguese translations.
| | * | | AI 149721: Import Portuguese translations.Eric Fischer2009-06-101-0/+31
| | | | | | | | | | | | | | | | | | | | Automated import of CL 149721
* | | | | am 8a8f58e9: DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGESan Mehat2009-06-011-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8a8f58e913d5dbf592bdff62da1b8ae74f014a64' * commit '8a8f58e913d5dbf592bdff62da1b8ae74f014a64': DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
| * | | | DownloadProvider: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGESan Mehat2009-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | am e848c012: Rename SDCARD_WRITE to WRITE_SDCARD.Dianne Hackborn2009-05-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e848c012a4549ff77ef1896d690ef663cb3972ca' * commit 'e848c012a4549ff77ef1896d690ef663cb3972ca': Rename SDCARD_WRITE to WRITE_SDCARD.
| * | | | Rename SDCARD_WRITE to WRITE_SDCARD.Dianne Hackborn2009-05-131-1/+1
| | | | |
* | | | | am 7788f80: am 4f8a76e: AI 148147: Import lots of zh_TW translation chanEric Fischer2009-04-301-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7788f8030f131fbed6f9281d14d4efcdcc6033de' * commit '7788f8030f131fbed6f9281d14d4efcdcc6033de': AI 148147: Import lots of zh_TW translation changes.
| * | | | am 4f8a76e: AI 148147: Import lots of zh_TW translation changes.Eric Fischer2009-04-301-6/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4f8a76e2c7e463c36fbb6bdd16576c9db01a2e78' into donut * commit '4f8a76e2c7e463c36fbb6bdd16576c9db01a2e78': AI 148147: Import lots of zh_TW translation changes.
| | * | | AI 148147: Import lots of zh_TW translation changes.Eric Fischer2009-04-301-6/+6
| | | |/ | | |/| | | | | | | | | Automated import of CL 148147
* | | | am cddbe7a: downloadprovider: Add SDCARD_WRITE permission to manifestSan Mehat2009-04-291-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'cddbe7a063ff5d39545161bf1751d39269a46467' * commit 'cddbe7a063ff5d39545161bf1751d39269a46467': downloadprovider: Add SDCARD_WRITE permission to manifest
| * | | downloadprovider: Add SDCARD_WRITE permission to manifestSan Mehat2009-04-231-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| | |
| * | | merge cupcake into donutJean-Baptiste Queru2009-04-220-0/+0
| |\| |
| | * | AI 146365: Import revised translations.Eric Fischer2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Automated import of CL 146365
* | | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| | |
| * | | Automated import from //branches/donutburger/...@140733,140733Feng Qian2009-03-241-1/+1
| | | |
* | | | Merge branch 'open_source' into google_internalThe Android Open Source Project2009-03-299-466/+514
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-6/+23
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: src/com/android/providers/downloads/DownloadThread.java
| | * | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-191-1/+1
| | |/
| * | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1716-30/+468
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/index.html src/com/android/providers/downloads/DownloadProvider.java src/com/android/providers/downloads/DownloadService.java
| * | | Make the DownloadProvider work in the simulatorJean-Baptiste Queru2009-02-271-1/+2
| | | |
| * | | MergeAndroid Code Review2009-02-271-4/+2
| |\ \ \
| | * | | Optimize call to queryIntentActivities()Jean-Baptiste Queru2009-02-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Remove stale uses-permission tag.Jean-Baptiste Queru2009-02-271-1/+0
| |/ / / | | | | | | | | | | | | | | | | 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.
| * | | MergeAndroid Code Review2009-02-091-8/+14
| |\ \ \
| | * | | Refine interaction between destination and default visibility.Jean-Baptiste Queru2009-02-061-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | Documentation about the download managerJean-Baptiste Queru2009-02-051-0/+828
| |/ / /
| * | | Merge branch 'cupcake'The Android Open Source Project2009-01-2211-0/+154
| |\ \ \