diff options
| author | Vasu Nori <vnori@google.com> | 2011-02-03 18:08:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-03 18:08:35 -0800 |
| commit | 580871b3950761a39a69e3cb4db9fbdfb96f3917 (patch) | |
| tree | e2022362fdc25fa99c313a8c8b509e2a7bca27bd /src/com/android/providers/downloads/DownloadProvider.java | |
| parent | 27478475ac5fd6f1b141b18b8b49f41beb8fce87 (diff) | |
| parent | 49663f1ffe58a546fb0d2ab84898843ef5e89eb5 (diff) | |
| download | android_packages_providers_DownloadProvider-580871b3950761a39a69e3cb4db9fbdfb96f3917.tar.gz android_packages_providers_DownloadProvider-580871b3950761a39a69e3cb4db9fbdfb96f3917.tar.bz2 android_packages_providers_DownloadProvider-580871b3950761a39a69e3cb4db9fbdfb96f3917.zip | |
am 49663f1f: am f20af912: Revert "Merge "bug:3341145 if ignore_size_limits flag set, validate caller\'s perms" into honeycomb"
* commit '49663f1ffe58a546fb0d2ab84898843ef5e89eb5':
Revert "Merge "bug:3341145 if ignore_size_limits flag set, validate caller's perms" into honeycomb"
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 34e2b20b..208d7856 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, " + @@ -620,15 +620,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) { |