summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | am cba66d82: (-s ours) am c08eb279: Import revised translations. DO NOT MERGEEric Fischer2010-10-250-0/+0
|\| | | | |_|/ |/| | | | | | | | | | | | | | Merge commit 'cba66d82e30d3ae1be826989229975e05cd9a754' * commit 'cba66d82e30d3ae1be826989229975e05cd9a754': Import revised translations. DO NOT MERGE
| * | am c08eb279: Import revised translations. DO NOT MERGEEric Fischer2010-10-2540-141/+178
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'c08eb2797760e31f3962795b84d0528149a84986' into gingerbread-plus-aosp * commit 'c08eb2797760e31f3962795b84d0528149a84986': Import revised translations. DO NOT MERGE
| | * Import revised translations. DO NOT MERGEEric Fischer2010-10-2540-141/+178
| | | | | | | | | | | | Change-Id: Id9cdaf0062ee97f067b644bcc00d41182ff52934
* | | am 298c2cd1: am 404d31e3: Replace shared storage with USB storage.Eric Fischer2010-10-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit '298c2cd136e25a705486c543d8c04311ab655d98' * commit '298c2cd136e25a705486c543d8c04311ab655d98': Replace shared storage with USB storage.
| * | am 404d31e3: Replace shared storage with USB storage.Eric Fischer2010-10-201-1/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit '404d31e3e2ca00e9c45b94ca0de9c36a87e999ab' into gingerbread-plus-aosp * commit '404d31e3e2ca00e9c45b94ca0de9c36a87e999ab': Replace shared storage with USB storage.
| | * Replace shared storage with USB storage.Eric Fischer2010-10-201-1/+1
| | | | | | | | | | | | Change-Id: If3fb1c213f9f9c6f21bd1f13f633393a32d2509a
* | | am e664fbaf: am 3c3ed3c1: bug:3083060 UI tweaks to DownloadManager screensVasu Nori2010-10-219-44/+46
|\| | | | | | | | | | | | | | | | | | | | Merge commit 'e664fbafc566f31f844dd543c30064e92f3653f7' * commit 'e664fbafc566f31f844dd543c30064e92f3653f7': bug:3083060 UI tweaks to DownloadManager screens
| * | am 3c3ed3c1: bug:3083060 UI tweaks to DownloadManager screensVasu Nori2010-10-199-44/+46
| |\| | | | | | | | | | | | | | | | | | | Merge commit '3c3ed3c1488c2ebfd2b66a3cdf09b3e312883159' into gingerbread-plus-aosp * commit '3c3ed3c1488c2ebfd2b66a3cdf09b3e312883159': bug:3083060 UI tweaks to DownloadManager screens
| | * bug:3083060 UI tweaks to DownloadManager screensVasu Nori2010-10-199-44/+46
| | | | | | | | | | | | Change-Id: I3c7ee819077d344072deee4cfd61f883c64da758
* | | remove usage of hidden public constants.Vasu Nori2010-10-209-29/+27
| | | | | | | | | | | | Change-Id: I2edf1bef5e741de8193cb293807e3ace42003b0c
* | | am 1b831d75: (-s ours) am 4c1acb60: Merge "Import revised translations DO ↵Kenny Root2010-10-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d' * commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d': Import revised translations DO NOT MERGE
| * | am 4c1acb60: Merge "Import revised translations DO NOT MERGE" into gingerbreadKenny Root2010-10-151-2/+2
| |\| | | | | | | | | | | | | | | | | | | Merge commit '4c1acb60162e2a2e8c80a996676a4d543a2eb3a7' into gingerbread-plus-aosp * commit '4c1acb60162e2a2e8c80a996676a4d543a2eb3a7': Import revised translations DO NOT MERGE
| | * Merge "Import revised translations DO NOT MERGE" into gingerbreadKenny Root2010-10-151-2/+2
| | |\
| | | * Import revised translations DO NOT MERGEKenny Root2010-10-151-2/+2
| | | | | | | | | | | | | | | | Change-Id: I21052e55a62dd3d9a9846dec30c3ac12cc9c25af
* | | | am 9f6654cf: Merge 216736d2 from gingerbreadJean-Baptiste Queru2010-10-182-54/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9f6654cfec6e6d8d1e3de9a8adeba46137a22105' * commit '9f6654cfec6e6d8d1e3de9a8adeba46137a22105': bug:3099994 NPE in DownloadManager when deleting non-media file
| * | | Merge 216736d2 from gingerbreadJean-Baptiste Queru2010-10-152-54/+73
| |\| | | | | | | | | | | | | | Change-Id: I404d1a66d337b1dade181ade92dc21fc0e819aa7
| | * | Merge "bug:3099994 NPE in DownloadManager when deleting non-media file" into ↵Vasu Nori2010-10-152-54/+73
| | |\ \ | | | |/ | | |/| | | | | gingerbread
| | | * bug:3099994 NPE in DownloadManager when deleting non-media fileVasu Nori2010-10-152-54/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DownloadService always scans files and assumes MediaProvider returns a valid Uri. But MediaProvider returns null for return param 'uri' if the file is not audio/video/image etc media type file (for example, pdf) Change-Id: If32bd1895b00b5406973a5e240ad3558d46f9f4a
* | | | am f61c1d08: (-s ours) am 887a95e2: Import revised translationsKenny Root2010-10-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f61c1d08555ac418d2b3337f74807821a30ab47c' * commit 'f61c1d08555ac418d2b3337f74807821a30ab47c': Import revised translations
| * | | am 887a95e2: Import revised translationsKenny Root2010-10-1440-380/+220
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '887a95e29a8776a07b411c472a11e82ad84464a8' into gingerbread-plus-aosp * commit '887a95e29a8776a07b411c472a11e82ad84464a8': Import revised translations
| | * | Import revised translationsKenny Root2010-10-1440-380/+220
| | |/ | | | | | | | | | Change-Id: I03a58b6efd2e1a12054bc7dbb320368be6cfdd17
* | | am 3e759e21: am a53c21ed: fix broken build bug:3095237Vasu Nori2010-10-151-3/+1
|\| | | | | | | | | | | | | | | | | | | | Merge commit '3e759e21291d6ca1a49ded3f24f3be0a26af4e2b' * commit '3e759e21291d6ca1a49ded3f24f3be0a26af4e2b': fix broken build bug:3095237
| * | am a53c21ed: fix broken build bug:3095237Vasu Nori2010-10-131-3/+1
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'a53c21edb5dc57d97dcddd03fbfa2022abf43787' into gingerbread-plus-aosp * commit 'a53c21edb5dc57d97dcddd03fbfa2022abf43787': fix broken build bug:3095237
| | * fix broken build bug:3095237Vasu Nori2010-10-131-3/+1
| | | | | | | | | | | | Change-Id: I7e1fe99cc482fc270894a820049275fc0c64233e
* | | am 57c4e918: am e00c3120: bug:3069735 in Download UI app, handle deletes ↵Vasu Nori2010-10-154-37/+157
|\| | | | | | | | | | | | | | | | | | | | | | | | | | correctly Merge commit '57c4e9180e3a339dba984f1c8dff76ef18443a7a' * commit '57c4e9180e3a339dba984f1c8dff76ef18443a7a': bug:3069735 in Download UI app, handle deletes correctly
| * | am e00c3120: bug:3069735 in Download UI app, handle deletes correctlyVasu Nori2010-10-134-37/+157
| |\| | | | | | | | | | | | | | | | | | | Merge commit 'e00c31208405bd2e4c88e069df7a2b15237f70bf' into gingerbread-plus-aosp * commit 'e00c31208405bd2e4c88e069df7a2b15237f70bf': bug:3069735 in Download UI app, handle deletes correctly
| | * bug:3069735 in Download UI app, handle deletes correctlyVasu Nori2010-10-134-37/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread. High-level details 1. When a file is downloaded by DownloadManager, metadata about the file is stored in 2 databases: DownloadProvider and MediaProvider. 2. So, when it is to be deleted, its metadata needs to be cleaned up from both the databases. 3. But the 2 databases use differnt content-uri's as "primary keys" and DownloadProvider loses the "primary-key" of the row in MediaProvider database. 4. Easiest thing would have been to have DownloadProvider give filepath to MediaProvider and let MediaProvider linearly scan its database to locate the row and delete it. 5. The other - faster but more coding for now - option is to have DownloadProvider store the "primary-key" of the MediaProvider's row. implemented in this CL. Low-level details 1. add 2 new columns to downloads table in downloads.db: mediaprovider_uri = downloaded file's content_uri in mediaprovider db this column is null for downloads that finished before this column is added to the database. deleted = flag is set to true if a file is to be deleted 2. download UI app shows only those files whose 'deleted' flag is not set. 3. when the user deletes downloads from download UI app, 3.1. if mediaprovider_uri is NOT null, then the row is deleted from downloads table AND from the mediaprovider database. 3.2 if mediaprovider_uri is NULL, then its row in downloads database is marked 'tp be deleted' by setting 'deleted' column to '1'. 4. When DownloadService (in DownloadProvider) processes all rows from downloads table, if it sees any rows wth 'deleted' = 1, then it uses MediaScanner Service to re-scan the file, get the mediaprovider_uri from MediaProvider and update the row in downloads table with this mediaprovider_uri value and then delete the row by doing the following 1. delete it from MediaProvider database using mediaprovider_uri 2. delete it from DownloadProvider database Problem with this solution: There is a small window where it is deleted by the user on the Download app (and the row disappears from the display) but it is still present in Gallery app. Thats due to the following asynchronous operations 1. DownladService which processes rows-to-be-deleted is not always up 2. DownloadService uses asynchronous call to have the file re-scanned by MediaScanner to get mediaprovider_uri Change-Id: Ib90eb9e647f543312c865d3bbf9a06fb867a648b
* | | am 1f262cf3: am cd990514: Merge "Make DownloadProvider use parameterized ↵Steve Howard2010-10-101-39/+57
|\| | | | | | | | | | | | | | | | | | | | | | | | | | queries." into gingerbread Merge commit '1f262cf3af0512e0d621b7818aab9bb79527f01f' * commit '1f262cf3af0512e0d621b7818aab9bb79527f01f': Make DownloadProvider use parameterized queries.
| * | am cd990514: Merge "Make DownloadProvider use parameterized queries." into ↵Steve Howard2010-10-081-39/+57
| |\| | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'cd990514feb2b17848809d9262e0d73a828b2142' into gingerbread-plus-aosp * commit 'cd990514feb2b17848809d9262e0d73a828b2142': Make DownloadProvider use parameterized queries.
| | * Merge "Make DownloadProvider use parameterized queries." into gingerbreadSteve Howard2010-10-081-39/+57
| | |\
| | | * Make DownloadProvider use parameterized queries.Steve Howard2010-10-081-39/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids filling up the query cache unnecessary, but required some structural changes to ease the passing around of a selection along with its arguments. Change-Id: I724185763b94146d17573cab68f675c24e49634e
* | | | am 136b2d6a: (-s ours) am 49f78e40: Import revised translations. DO NOT MERGEEric Fischer2010-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '136b2d6aed4adc9537504e33e5d3b9b0bc5ef22f' * commit '136b2d6aed4adc9537504e33e5d3b9b0bc5ef22f': Import revised translations. DO NOT MERGE
| * | | am 49f78e40: Import revised translations. DO NOT MERGEEric Fischer2010-10-0740-320/+180
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '49f78e40831793ff805bb602b226c372212998ec' into gingerbread-plus-aosp * commit '49f78e40831793ff805bb602b226c372212998ec': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2010-10-0640-320/+180
| | |/ | | | | | | | | | Change-Id: I1f00b783250d0c4112cf7918f9ab05f83c209407
* | | am f5328cae: am e4b64535: Merge "Updated assets for downloads UI launcher ↵Steve Howard2010-10-042-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | icon" into gingerbread Merge commit 'f5328cae2422ca2c03c6eb888545d6a56ccfdf0c' * commit 'f5328cae2422ca2c03c6eb888545d6a56ccfdf0c': Updated assets for downloads UI launcher icon
| * | am e4b64535: Merge "Updated assets for downloads UI launcher icon" into ↵Steve Howard2010-10-042-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit 'e4b6453558531bc897720f9c94affc650c99e974' into gingerbread-plus-aosp * commit 'e4b6453558531bc897720f9c94affc650c99e974': Updated assets for downloads UI launcher icon
| | * Merge "Updated assets for downloads UI launcher icon" into gingerbreadSteve Howard2010-10-042-0/+0
| | |\
| | | * Updated assets for downloads UI launcher iconSteve Howard2010-09-282-0/+0
| | | | | | | | | | | | | | | | Change-Id: I0dc0ef687ebc33a19b3af070df2722840a20eba1
* | | | am ace1d5da: am d4dc8501: Merge "Seriously improve error reporting in ↵Steve Howard2010-10-014-198/+164
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DownloadThread." into gingerbread Merge commit 'ace1d5da2b288f6166224cf2164731ae0fa2de61' * commit 'ace1d5da2b288f6166224cf2164731ae0fa2de61': Seriously improve error reporting in DownloadThread.
| * | | am d4dc8501: Merge "Seriously improve error reporting in DownloadThread." ↵Steve Howard2010-10-014-198/+164
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'd4dc8501ecb89b91f865510207297dd960afe031' into gingerbread-plus-aosp * commit 'd4dc8501ecb89b91f865510207297dd960afe031': Seriously improve error reporting in DownloadThread.
| | * | Merge "Seriously improve error reporting in DownloadThread." into gingerbreadSteve Howard2010-10-014-198/+164
| | |\ \
| | | * | Seriously improve error reporting in DownloadThread.Steve Howard2010-09-304-198/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My old error reporting strategy for DownloadThread was to log the stack trace for the exception, so we'd know exactly what conditions caused the StopRequest. hackbod suggested that we shouldn't log tracebacks as they clutter the log. Instead, we should just always include a little string tag explaining why the request is being stopped -- this is more concise and more useful to developers. There are three main changes here to acheive this goal: * make StopRequest require a short, log-friendly error message upon construction, and add such a message to all construction sites * make a similar change to GenerateSaveFileError, so that the variety of errors that originate with Helpers.generateSaveFile() get similarly fine-grained and concise error reporting * make network usable checking code return a distinct error code for each distinct negative condition, and add a utility to return a log-friendly error message for each such code. Finally, I cleaned up some of the ways errors/exceptions are handled in the process. Change-Id: Ie70cbf3f2960e260e97f8449258e25218d0f900f
* | | | | am 42469fa4: am 5d81e244: Avoid NPE when checking file URI in DownloadProviderSteve Howard2010-10-011-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '42469fa405c7aa891e7c431cd65edd424803979c' * commit '42469fa405c7aa891e7c431cd65edd424803979c': Avoid NPE when checking file URI in DownloadProvider
| * | | | am 5d81e244: Avoid NPE when checking file URI in DownloadProviderSteve Howard2010-10-011-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5d81e2447ed77860afecd71583e137178c2c6807' into gingerbread-plus-aosp * commit '5d81e2447ed77860afecd71583e137178c2c6807': Avoid NPE when checking file URI in DownloadProvider
| | * | | Avoid NPE when checking file URI in DownloadProviderSteve Howard2010-09-301-1/+2
| | |/ / | | | | | | | | | | | | Change-Id: Ic937b05308cecce244725e25767a3a1310a8463d
* | | | am f28405c1: am 8df47822: Merge "Handle null local URI when deleting a ↵Steve Howard2010-09-301-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | download." into gingerbread Merge commit 'f28405c10d132a2eeaff5140d8a83a72d9fa530b' * commit 'f28405c10d132a2eeaff5140d8a83a72d9fa530b': Handle null local URI when deleting a download.
| * | | am 8df47822: Merge "Handle null local URI when deleting a download." into ↵Steve Howard2010-09-301-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '8df47822435f7f66dd34f87dcaa73bbbcd808483' into gingerbread-plus-aosp * commit '8df47822435f7f66dd34f87dcaa73bbbcd808483': Handle null local URI when deleting a download.
| | * | Merge "Handle null local URI when deleting a download." into gingerbreadSteve Howard2010-09-301-3/+5
| | |\ \
| | | * | Handle null local URI when deleting a download.Steve Howard2010-09-301-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd written this to assume a non-null local URI, but I forgot the legacy downloads can still have null local URI, so this handling needs to remain until the legacy API is dead and gone. Change-Id: Icfe8dc2a6fead03b09cabe684c713fb6f0e6c1ab
* | | | | am c8b388cf: (-s ours) am 6fbdadce: Merge "Import revised translations. DO ↵Eric Fischer2010-09-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread Merge commit 'c8b388cfe0d250892b63b4ee38b9af532763cf7e' * commit 'c8b388cfe0d250892b63b4ee38b9af532763cf7e': Import revised translations. DO NOT MERGE