Revert "Merge "bug:3341145 if ignore_size_limits flag set, validate caller's perms" into honeycomb"

This reverts commit 3e7bb1c5d7e7d1a013df959c1a6947b33df0a0fd, reversing
changes made to b2085f61b37ad4a70c799012f25ff62a38173f68.

3 files changed, 9 insertions, 10 deletions

diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java
index 4b95e765..ef0c6dbb 100644
--- a/src/com/android/providers/downloads/Constants.java
+++ b/src/com/android/providers/downloads/Constants.java
@@ -31,6 +31,9 @@ public class Constants {
     /** The column that used to be used for the HTTP method of the request */
     public static final String RETRY_AFTER_X_REDIRECT_COUNT = "method";
 
+    /** The column that used to be used for the magic OTA update filename */
+    public static final String OTA_UPDATE = "otaupdate";
+
     /** The column that used to be used to reject system filetypes */
     public static final String NO_SYSTEM_FILES = "no_system";
 
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java
index 4647999f..f375b3f1 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(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS) == 1;
+            info.mOtaUpdate = getInt(Constants.OTA_UPDATE) == 1;
 
             synchronized (this) {
                 info.mControl = getInt(Downloads.Impl.COLUMN_CONTROL);
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 26b43cdd..94b10d53 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -359,7 +359,7 @@ public final class DownloadProvider extends ContentProvider {
                         Downloads.Impl.COLUMN_APP_DATA + " TEXT, " +
                         Downloads.Impl.COLUMN_NO_INTEGRITY + " BOOLEAN, " +
                         Downloads.Impl.COLUMN_FILE_NAME_HINT + " TEXT, " +
-                        Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS + " BOOLEAN, " +
+                        Constants.OTA_UPDATE + " BOOLEAN, " +
                         Downloads.Impl._DATA + " TEXT, " +
                         Downloads.Impl.COLUMN_MIME_TYPE + " TEXT, " +
                         Downloads.Impl.COLUMN_DESTINATION + " INTEGER, " +
@@ -588,15 +588,11 @@ public final class DownloadProvider extends ContentProvider {
             copyBoolean(Downloads.Impl.COLUMN_ALLOW_ROAMING, values, filteredValues);
         }
 
-        if (values.containsKey(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS)) {
-            boolean ignoreLimits = values.getAsBoolean(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS);
-            if (ignoreLimits &&
+        // TODO: replace this hack with something cleaner
+        if (pckg.equals(GSF_PACKAGE_NAME) &&
                 (getContext().checkCallingPermission(Downloads.Impl.PERMISSION_ACCESS_ADVANCED)
-                        != PackageManager.PERMISSION_GRANTED)) {
-                throw new SecurityException("seting ignore_size_limits flag to true NOT allowed, " +
-                        "unless android.permission.ACCESS_DOWNLOAD_MANAGER_ADVANCED is granted");
-            }
-            filteredValues.put(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS, ignoreLimits);
+                        == PackageManager.PERMISSION_GRANTED)) {
+            filteredValues.put(Constants.OTA_UPDATE, Boolean.TRUE);
         }
 
         if (Constants.LOGVV) {