diff options
author | Vasu Nori <vnori@google.com> | 2011-02-02 15:01:41 -0800 |
---|---|---|
committer | Vasu Nori <vnori@google.com> | 2011-02-02 15:09:04 -0800 |
commit | 86c04344cd871e0a443ab3dee86f8f7994f6d429 (patch) | |
tree | 7744cf3758f6412da35d56f7e13b2f4d23eacfd8 /src/com/android/providers/downloads/DownloadProvider.java | |
parent | ea245800c69d6bc10dc2680e6a242f59e9cb49b6 (diff) | |
download | android_packages_providers_DownloadProvider-86c04344cd871e0a443ab3dee86f8f7994f6d429.tar.gz android_packages_providers_DownloadProvider-86c04344cd871e0a443ab3dee86f8f7994f6d429.tar.bz2 android_packages_providers_DownloadProvider-86c04344cd871e0a443ab3dee86f8f7994f6d429.zip |
bug:3341145 if ignore_size_limits flag set, validate caller's perms
and then of course ignore the mobile network size limits
Change-Id: I6765be9255187f93bd51acecc19a15db4f324204
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 94b10d53..26b43cdd 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, " + - Constants.OTA_UPDATE + " BOOLEAN, " + + Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS + " BOOLEAN, " + Downloads.Impl._DATA + " TEXT, " + Downloads.Impl.COLUMN_MIME_TYPE + " TEXT, " + Downloads.Impl.COLUMN_DESTINATION + " INTEGER, " + @@ -588,11 +588,15 @@ public final class DownloadProvider extends ContentProvider { copyBoolean(Downloads.Impl.COLUMN_ALLOW_ROAMING, values, filteredValues); } - // TODO: replace this hack with something cleaner - if (pckg.equals(GSF_PACKAGE_NAME) && + if (values.containsKey(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS)) { + boolean ignoreLimits = values.getAsBoolean(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS); + if (ignoreLimits && (getContext().checkCallingPermission(Downloads.Impl.PERMISSION_ACCESS_ADVANCED) - == PackageManager.PERMISSION_GRANTED)) { - filteredValues.put(Constants.OTA_UPDATE, Boolean.TRUE); + != 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); } if (Constants.LOGVV) { |