diff options
| author | Steve Howard <showard@google.com> | 2010-09-21 13:12:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 13:12:59 -0700 |
| commit | b157649a5620aba3ad65750d1044100b62c65d9c (patch) | |
| tree | 8514857a79a472bc98a065246b115f42162a3d3f /src/com/android/providers/downloads/DownloadProvider.java | |
| parent | 1ac6c7175c1f298732627fafc0ad225f50bfec9c (diff) | |
| parent | 7b96b251c0404ed3f05652bd7d5209910fb999cc (diff) | |
| download | android_packages_providers_DownloadProvider-b157649a5620aba3ad65750d1044100b62c65d9c.tar.gz android_packages_providers_DownloadProvider-b157649a5620aba3ad65750d1044100b62c65d9c.tar.bz2 android_packages_providers_DownloadProvider-b157649a5620aba3ad65750d1044100b62c65d9c.zip | |
am 7b96b251: am d3197296: Implement dialogs for wifi required + recommended limits.
Merge commit '7b96b251c0404ed3f05652bd7d5209910fb999cc'
* commit '7b96b251c0404ed3f05652bd7d5209910fb999cc':
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 6d397d3d..0e451d04 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); } @@ -834,7 +839,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; } } |