am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb

* commit '6bc710f769618e87b98d51cd02241e6b1a2fb653':
  bug:3414192 new API to designate a download to be OTA update

2 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 297d246..d37983f 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -339,6 +339,7 @@ public class DownloadManager {
         private boolean mIsVisibleInDownloadsUi = true;
         private boolean mScannable = false;
         private boolean mUseSystemCache = false;
+        private boolean mOtaUpdate = false;
         /** if a file is designated as a MediaScanner scannable file, the following value is
          * stored in the database column {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.
          */
@@ -605,6 +606,13 @@ public class DownloadManager {
         }
 
         /**
+         * Set whether the download request is OTA Update. By default, it is set to false.
+         */
+        public void setDownloadToBeOtaUpdate() {
+            mOtaUpdate = true;
+        }
+
+        /**
          * Set whether this download should be displayed in the system's Downloads UI. True by
          * default.
          * @param isVisible whether to display this download in the Downloads UI
@@ -650,6 +658,7 @@ public class DownloadManager {
             values.put(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES, mAllowedNetworkTypes);
             values.put(Downloads.Impl.COLUMN_ALLOW_ROAMING, mRoamingAllowed);
             values.put(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI, mIsVisibleInDownloadsUi);
+            values.put(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS, mOtaUpdate);
 
             return values;
         }
diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java
index 013edd3..ad0140b 100644
--- a/core/java/android/provider/Downloads.java
+++ b/core/java/android/provider/Downloads.java
@@ -397,6 +397,12 @@ public final class Downloads {
          */
         public static final String COLUMN_LAST_UPDATESRC = "lastUpdateSrc";
 
+        /** Set this column to true if the given download should ignore the mobile network
+         * download limits.
+         * <P>Type: Boolean</P>
+         */
+        public static final String COLUMN_IGNORE_SIZE_LIMITS = "otaupdate";
+
         /**
          * default value for {@link #COLUMN_LAST_UPDATESRC}.
          * This value is used when this column's value is not relevant.