diff options
| author | Vasu Nori <vnori@google.com> | 2011-02-02 17:05:07 -0800 |
|---|---|---|
| committer | Vasu Nori <vnori@google.com> | 2011-02-02 17:05:07 -0800 |
| commit | ed4870094f53bcd19c0542400389a1f56636ce5a (patch) | |
| tree | 3727c3210a981c51dc708eb9a81781fe413d2844 /src/com/android/providers/downloads/DownloadInfo.java | |
| parent | a7f7882cd06aff28de27f00d5d5cc9aa0afaba0e (diff) | |
| parent | 43d649e92d9e25153225122865b4da658d051750 (diff) | |
| download | android_packages_providers_DownloadProvider-ed4870094f53bcd19c0542400389a1f56636ce5a.tar.gz android_packages_providers_DownloadProvider-ed4870094f53bcd19c0542400389a1f56636ce5a.tar.bz2 android_packages_providers_DownloadProvider-ed4870094f53bcd19c0542400389a1f56636ce5a.zip | |
resolved conflicts for merge of 43d649e9 to master
Change-Id: I27a615509269f256cf66de2dd217d8c4667caab4
Diffstat (limited to 'src/com/android/providers/downloads/DownloadInfo.java')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index 0ff51260..d6d82dd8 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -90,7 +90,7 @@ public class DownloadInfo { info.mDescription = getString(Downloads.Impl.COLUMN_DESCRIPTION); info.mBypassRecommendedSizeLimit = getInt(Downloads.Impl.COLUMN_BYPASS_RECOMMENDED_SIZE_LIMIT); - info.mOtaUpdate = getInt(Constants.OTA_UPDATE) == 1; + info.mOtaUpdate = getInt(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS) == 1; synchronized (this) { info.mControl = getInt(Downloads.Impl.COLUMN_CONTROL); |