diff options
author | Steve Howard <showard@google.com> | 2010-09-21 13:02:10 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 13:02:10 -0700 |
commit | 7b96b251c0404ed3f05652bd7d5209910fb999cc (patch) | |
tree | cd7ca92307ba190a9798ce1afdd1e1de63e538f8 /src/com/android/providers/downloads/DownloadProvider.java | |
parent | 7c5a33e468d8d029f66c2fe9191132e9b4ad991b (diff) | |
parent | d319729622da1893e895f2e35f41d01ecdca3705 (diff) | |
download | android_packages_providers_DownloadProvider-7b96b251c0404ed3f05652bd7d5209910fb999cc.tar.gz android_packages_providers_DownloadProvider-7b96b251c0404ed3f05652bd7d5209910fb999cc.tar.bz2 android_packages_providers_DownloadProvider-7b96b251c0404ed3f05652bd7d5209910fb999cc.zip |
am d3197296: Implement dialogs for wifi required + recommended limits.
Merge commit 'd319729622da1893e895f2e35f41d01ecdca3705' into gingerbread-plus-aosp
* commit 'd319729622da1893e895f2e35f41d01ecdca3705':
Implement dialogs for wifi required + recommended limits.
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 102c611d..26065015 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -57,7 +57,7 @@ public final class DownloadProvider extends ContentProvider { /** Database filename */ private static final String DB_NAME = "downloads.db"; /** Current database version */ - private static final int DB_VERSION = 103; + private static final int DB_VERSION = 104; /** Name of table in the database */ private static final String DB_TABLE = "downloads"; @@ -223,6 +223,11 @@ public final class DownloadProvider extends ContentProvider { makeCacheDownloadsInvisible(db); break; + case 104: + addColumn(db, DB_TABLE, Downloads.Impl.COLUMN_BYPASS_RECOMMENDED_SIZE_LIMIT, + "INTEGER NOT NULL DEFAULT 0"); + break; + default: throw new IllegalStateException("Don't know how to upgrade to " + version); } @@ -839,7 +844,9 @@ public final class DownloadProvider extends ContentProvider { Integer status = values.getAsInteger(Downloads.Impl.COLUMN_STATUS); boolean isRestart = status != null && status == Downloads.Impl.STATUS_PENDING; - if (isRestart) { + boolean isUserBypassingSizeLimit = + values.containsKey(Downloads.Impl.COLUMN_BYPASS_RECOMMENDED_SIZE_LIMIT); + if (isRestart || isUserBypassingSizeLimit) { startService = true; } } |