diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-15 23:04:36 +0000 |
commit | 98987d083d898431ac7864d1491d2ea4a6c8ed93 (patch) | |
tree | 872a186794289b788328c662d51e6fabc4489ba0 | |
parent | 231f37549c48120d69e5304a633d9f9ef08cb77c (diff) | |
parent | 86608d1b8712c93dc06ae533051099231ddab46c (diff) | |
download | android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.tar.gz android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.tar.bz2 android_packages_providers_DownloadProvider-98987d083d898431ac7864d1491d2ea4a6c8ed93.zip |
Snap for 5663715 from 86608d1b8712c93dc06ae533051099231ddab46c to qt-qpr1-release
Change-Id: Ib23734e55e3c228cd55742cd41825aa6d15f51e6
-rw-r--r-- | res/values-hi/strings.xml | 2 | ||||
-rw-r--r-- | res/values-hr/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/providers/downloads/DownloadStorageProvider.java | 12 | ||||
-rw-r--r-- | ui/res/values-fa/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-hi/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-ky/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-my/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-nb/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-te/strings.xml | 2 | ||||
-rw-r--r-- | ui/res/values-tl/strings.xml | 4 |
10 files changed, 12 insertions, 20 deletions
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 9088b32e..25fdef60 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -31,7 +31,7 @@ <string name="permlab_accessAllDownloads" msgid="2436240495424393717">"सभी सिस्टम डाउनलोड में पहुंच प्राप्त करें"</string> <string name="permdesc_accessAllDownloads" msgid="1871832254578267128">"ऐप्स को सिस्टम पर किसी भी ऐप्स द्वारा शुरू किए गए सभी डाउनलोड देखने और संशोधित करने देता है."</string> <string name="download_unknown_title" msgid="7015124071247271585">"<शीर्षक-रहित>"</string> - <string name="notification_download_complete" msgid="5443563299253103667">"डाउनलोड पूर्ण."</string> + <string name="notification_download_complete" msgid="5443563299253103667">"डाउनलोड पूरा हुआ."</string> <string name="notification_download_failed" msgid="8612136111952014978">"डाउनलोड विफल."</string> <string name="notification_need_wifi_for_size" msgid="2556172885154833575">"डाउनलोड आकार के लिए वाई-फ़ाई आवश्यक."</string> <string name="notification_paused_in_background" msgid="4328508073283591772">"पृष्ठभूमि में रोका गया."</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index ba6f2f07..b3af03bf 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -39,7 +39,7 @@ <string name="wifi_required_body" msgid="3067694630143784449">"Morate upotrijebiti Wi-Fi da biste dovršili ovo preuzimanje veličine <xliff:g id="SIZE">%1$s </xliff:g>. \n\nDodirnite tekst <xliff:g id="QUEUE_TEXT">%2$s </xliff:g> da biste pokrenuli preuzimanje sljedeći put kada se povežete s Wi-Fi mrežom."</string> <string name="wifi_recommended_title" msgid="7441589306734687400">"Staviti na čekanje za kasnije preuzimanje?"</string> <string name="wifi_recommended_body" msgid="1314735166699936073">"Pokretanje ovog preuzimanja od <xliff:g id="SIZE">%1$s </xliff:g> može skratiti vijek baterije i/ili uzrokovati pretjeranu upotrebu podatkovne veze i dodatne troškove.\n\n Dodirnite <xliff:g id="QUEUE_TEXT">%2$s</xliff:g> da biste preuzeli pri sljedećem spajanju s Wi-Fi mrežom."</string> - <string name="button_queue_for_wifi" msgid="422576726189179221">"Red čekanja"</string> + <string name="button_queue_for_wifi" msgid="422576726189179221">"Redoslijed"</string> <string name="button_cancel_download" msgid="2430166148737975604">"Odustani"</string> <string name="button_start_now" msgid="792123674007840864">"Započni sad"</string> <plurals name="notif_summary_active" formatted="false" msgid="7290448463204837173"> diff --git a/src/com/android/providers/downloads/DownloadStorageProvider.java b/src/com/android/providers/downloads/DownloadStorageProvider.java index 2ffe6ce8..fc7dd5ed 100644 --- a/src/com/android/providers/downloads/DownloadStorageProvider.java +++ b/src/com/android/providers/downloads/DownloadStorageProvider.java @@ -223,20 +223,12 @@ public class DownloadStorageProvider extends FileSystemProvider { // Delegate to real provider final long token = Binder.clearCallingIdentity(); try { - if (RawDocumentsHelper.isRawDocId(docId)) { + if (RawDocumentsHelper.isRawDocId(docId) || isMediaStoreDownload(docId)) { super.deleteDocument(docId); return; } - int count; - if (isMediaStoreDownload(docId)) { - count = getContext().getContentResolver().delete( - getMediaStoreUri(docId), null, null); - } else { - count = mDm.remove(Long.parseLong(docId)); - } - - if (count != 1) { + if (mDm.remove(Long.parseLong(docId)) != 1) { throw new IllegalStateException("Failed to delete " + docId); } } finally { diff --git a/ui/res/values-fa/strings.xml b/ui/res/values-fa/strings.xml index e78f900e..cc1373be 100644 --- a/ui/res/values-fa/strings.xml +++ b/ui/res/values-fa/strings.xml @@ -21,7 +21,7 @@ <string name="download_title_sorted_by_size" msgid="1417193166677094813">"بارگیریها - مرتب شده براساس اندازه"</string> <string name="no_downloads" msgid="1029667411186146836">"نه بارگیریها."</string> <string name="missing_title" msgid="830115697868833773">"<ناشناس>"</string> - <string name="button_sort_by_size" msgid="7331549713691146251">"براساس اندازه مرتب شود"</string> + <string name="button_sort_by_size" msgid="7331549713691146251">"مرتبسازی براساس اندازه"</string> <string name="button_sort_by_date" msgid="8800842892684101528">"ترتیب براساس تاریخ"</string> <string name="download_queued" msgid="104973307780629904">"در صف"</string> <string name="download_running" msgid="4656462962155580641">"در حال انجام"</string> diff --git a/ui/res/values-hi/strings.xml b/ui/res/values-hi/strings.xml index 0367c259..f5ba36d2 100644 --- a/ui/res/values-hi/strings.xml +++ b/ui/res/values-hi/strings.xml @@ -25,7 +25,7 @@ <string name="button_sort_by_date" msgid="8800842892684101528">"तारीख द्वारा क्रमित करें"</string> <string name="download_queued" msgid="104973307780629904">"कतार में"</string> <string name="download_running" msgid="4656462962155580641">"जारी"</string> - <string name="download_success" msgid="7006048006543495236">"पूर्ण"</string> + <string name="download_success" msgid="7006048006543495236">"पूरा हुआ"</string> <string name="download_error" msgid="8081329546008568251">"विफल"</string> <string name="dialog_title_not_available" msgid="5746317632356158515">"डाउनलोड नहीं किया जा सका"</string> <string name="dialog_failed_body" msgid="587545111677064427">"क्या आप बाद में फ़ाइल डाउनलोड करने का फिर से प्रयास करना चाहते हैं या उसे कतार से हटाना चाहते हैं?"</string> diff --git a/ui/res/values-ky/strings.xml b/ui/res/values-ky/strings.xml index 7b153c69..701149ad 100644 --- a/ui/res/values-ky/strings.xml +++ b/ui/res/values-ky/strings.xml @@ -45,7 +45,7 @@ <string name="retry_download" msgid="7617100787922717912">"Кайра аракеттенүү"</string> <string name="start_now_download" msgid="1564642872809509681">"Азыр баштоо"</string> <string name="deselect_all" msgid="6348198946254776764">"Баарын бошотуу"</string> - <string name="select_all" msgid="634074918366265804">"Бардыгын тандоо"</string> + <string name="select_all" msgid="634074918366265804">"Баарын тандоо"</string> <string name="selected_count" msgid="2101564570019753277">"<xliff:g id="TOTAL">%2$d</xliff:g> ичинен <xliff:g id="NUMBER">%1$d</xliff:g> тандалды"</string> <string name="download_share_dialog" msgid="3355867339806448955">"Бул аркылуу бөлүшүү:"</string> </resources> diff --git a/ui/res/values-my/strings.xml b/ui/res/values-my/strings.xml index 7ed89310..af465d0d 100644 --- a/ui/res/values-my/strings.xml +++ b/ui/res/values-my/strings.xml @@ -20,7 +20,7 @@ <string name="download_title_sorted_by_date" msgid="5898014492155434221">"ဒေါင်းလုဒ်များ -နေ့စွဲအလိုက် စီထားသည်"</string> <string name="download_title_sorted_by_size" msgid="1417193166677094813">"ဒေါင်းလုဒ်များ -အရွယ်အစားအလိုက် စီထားသည်"</string> <string name="no_downloads" msgid="1029667411186146836">"ဒေါင်းလုပ်မရှိပါ"</string> - <string name="missing_title" msgid="830115697868833773">"မသိပါ"</string> + <string name="missing_title" msgid="830115697868833773">"မသိ"</string> <string name="button_sort_by_size" msgid="7331549713691146251">"အရွယ်အစားအလိုက် စီရန်"</string> <string name="button_sort_by_date" msgid="8800842892684101528">"နေ့စွဲအလိုက် စီရန်"</string> <string name="download_queued" msgid="104973307780629904">"တန်းစီထားပြီး"</string> diff --git a/ui/res/values-nb/strings.xml b/ui/res/values-nb/strings.xml index 143fa765..acd92b3e 100644 --- a/ui/res/values-nb/strings.xml +++ b/ui/res/values-nb/strings.xml @@ -21,7 +21,7 @@ <string name="download_title_sorted_by_size" msgid="1417193166677094813">"Nedlastinger – etter størrelse"</string> <string name="no_downloads" msgid="1029667411186146836">"Ingen nedlastinger."</string> <string name="missing_title" msgid="830115697868833773">"<Ukjent>"</string> - <string name="button_sort_by_size" msgid="7331549713691146251">"Sorter etter størrelse"</string> + <string name="button_sort_by_size" msgid="7331549713691146251">"Sortér etter størrelse"</string> <string name="button_sort_by_date" msgid="8800842892684101528">"Sorter etter dato"</string> <string name="download_queued" msgid="104973307780629904">"I kø"</string> <string name="download_running" msgid="4656462962155580641">"Arbeider"</string> diff --git a/ui/res/values-te/strings.xml b/ui/res/values-te/strings.xml index 737a7c8f..d16805b1 100644 --- a/ui/res/values-te/strings.xml +++ b/ui/res/values-te/strings.xml @@ -21,7 +21,7 @@ <string name="download_title_sorted_by_size" msgid="1417193166677094813">"డౌన్లోడ్లు - పరిమాణం ద్వారా క్రమబద్ధీకరించబడినవి"</string> <string name="no_downloads" msgid="1029667411186146836">"డౌన్లోడ్లు ఏవీ లేవు."</string> <string name="missing_title" msgid="830115697868833773">"<తెలియదు>"</string> - <string name="button_sort_by_size" msgid="7331549713691146251">"పరిమాణం ద్వారా క్రమబద్ధీకరించు"</string> + <string name="button_sort_by_size" msgid="7331549713691146251">"పరిమాణం ద్వారా వర్గీకరించు"</string> <string name="button_sort_by_date" msgid="8800842892684101528">"తేదీ ద్వారా క్రమబద్ధీకరించు"</string> <string name="download_queued" msgid="104973307780629904">"క్రమవరుసలో ఉంచబడింది"</string> <string name="download_running" msgid="4656462962155580641">"ప్రోగ్రెస్లో ఉంది"</string> diff --git a/ui/res/values-tl/strings.xml b/ui/res/values-tl/strings.xml index 259b7927..da65f481 100644 --- a/ui/res/values-tl/strings.xml +++ b/ui/res/values-tl/strings.xml @@ -21,8 +21,8 @@ <string name="download_title_sorted_by_size" msgid="1417193166677094813">"Mga download - Inuri-uri ayon sa laki"</string> <string name="no_downloads" msgid="1029667411186146836">"Walang mga pag-download."</string> <string name="missing_title" msgid="830115697868833773">"<Hindi Kilala>"</string> - <string name="button_sort_by_size" msgid="7331549713691146251">"Uriin ayon sa laki"</string> - <string name="button_sort_by_date" msgid="8800842892684101528">"Uriin ayon sa petsa"</string> + <string name="button_sort_by_size" msgid="7331549713691146251">"Isaayos ayon sa laki"</string> + <string name="button_sort_by_date" msgid="8800842892684101528">"Isaayos ayon sa petsa"</string> <string name="download_queued" msgid="104973307780629904">"Naka-queue"</string> <string name="download_running" msgid="4656462962155580641">"Isinasagawa"</string> <string name="download_success" msgid="7006048006543495236">"Kumpleto"</string> |