summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-03-25 13:40:07 +0800
committerMichael Bestas <mikeioannina@cyanogenmod.org>2016-01-24 03:34:10 +0200
commit7c62314318501d063b8442f45692b07ac4006f60 (patch)
treec01592a8c0c4024ab4426a1a3953095efe54533b /src/com/android/providers
parentecd609e7017b8a69688bbae25c17d878ea305f19 (diff)
downloadandroid_packages_providers_DownloadProvider-7c62314318501d063b8442f45692b07ac4006f60.tar.gz
android_packages_providers_DownloadProvider-7c62314318501d063b8442f45692b07ac4006f60.tar.bz2
android_packages_providers_DownloadProvider-7c62314318501d063b8442f45692b07ac4006f60.zip
DownloadProvider: Still display as downloading after download failed
When the remaining space is less than 10% of the total space, download will fail, but it still display as downloading in status bar after failed in "Downloads" app. Check error status about downloads. If error exists, will update icon , content title and content text in notification. CRs-Fixed: 636489 Change-Id: I5554ef3d1505642c5cd847bd3d2e25a29772dc0d DownloadProvider: Use an alert icon for downloads that have an error status. Change-Id: If6d0f021cada1a09855009ab3276aa46bec74cfe
Diffstat (limited to 'src/com/android/providers')
-rw-r--r--src/com/android/providers/downloads/DownloadNotifier.java33
1 files changed, 32 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java
index 5e1b9de2..7fbb35b8 100644
--- a/src/com/android/providers/downloads/DownloadNotifier.java
+++ b/src/com/android/providers/downloads/DownloadNotifier.java
@@ -166,10 +166,22 @@ public class DownloadNotifier {
}
}
+ // Check error status about downloads. If error exists, will
+ // update icon and content title/content text in notification.
+ boolean hasErrorStatus = false;
+ for (DownloadInfo info : cluster) {
+ if (isErrorStatus(info.mStatus)) {
+ hasErrorStatus = true;
+ break;
+ }
+ }
+
// Show relevant icon
if (type == TYPE_ACTIVE) {
if (hasPausedStatus) {
builder.setSmallIcon(R.drawable.download_pause);
+ } else if (hasErrorStatus) {
+ builder.setSmallIcon(R.drawable.download_error);
} else {
builder.setSmallIcon(android.R.drawable.stat_sys_download);
}
@@ -223,9 +235,9 @@ public class DownloadNotifier {
String remainingText = null;
String percentText = null;
String speedAsSizeText = null;
+ long total = 0;
if (type == TYPE_ACTIVE) {
long current = 0;
- long total = 0;
long speed = 0;
synchronized (mDownloadSpeed) {
for (DownloadInfo info : cluster) {
@@ -289,6 +301,11 @@ public class DownloadNotifier {
} else if (speedAsSizeText != null) {
builder.setContentText(res.getString(R.string.download_speed_text,
remainingText, speedAsSizeText));
+ } else if (hasErrorStatus) {
+ builder.setContentText(res.getText(
+ R.string.notification_download_failed));
+ if (total == 0)
+ builder.setProgress(100, 0, false);
}
builder.setContentInfo(percentText);
@@ -317,6 +334,11 @@ public class DownloadNotifier {
if (type == TYPE_ACTIVE) {
if (hasPausedStatus) {
builder.setContentTitle(res.getString(R.string.download_queued));
+ } else if (hasErrorStatus) {
+ builder.setContentText(res.getText(
+ R.string.notification_download_failed));
+ if (total == 0)
+ builder.setProgress(100, 0, false);
} else {
builder.setContentTitle(res.getQuantityString(
R.plurals.notif_summary_active, cluster.size(), cluster.size()));
@@ -421,4 +443,13 @@ public class DownloadNotifier {
return status == Downloads.Impl.STATUS_WAITING_FOR_NETWORK ||
status == Downloads.Impl.STATUS_PAUSED_BY_MANUAL;
}
+
+ private static boolean isErrorStatus(int status) {
+ boolean isErrorStatus = Downloads.Impl.isStatusError(status)
+ || Downloads.Impl.isStatusClientError(status)
+ || Downloads.Impl.isStatusServerError(status)
+ || status == Downloads.Impl.STATUS_INSUFFICIENT_SPACE_ERROR
+ || status == Downloads.Impl.STATUS_DEVICE_NOT_FOUND_ERROR;
+ return isErrorStatus;
+ }
}