diff options
-rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 6 | ||||
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 10 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index 0ff51260..3587dbfb 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -90,7 +90,6 @@ 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; synchronized (this) { info.mControl = getInt(Downloads.Impl.COLUMN_CONTROL); @@ -213,7 +212,6 @@ public class DownloadInfo { public String mTitle; public String mDescription; public int mBypassRecommendedSizeLimit; - public boolean mOtaUpdate; public int mFuzz; @@ -412,10 +410,6 @@ public class DownloadInfo { if (networkType == ConnectivityManager.TYPE_WIFI) { return NETWORK_OK; // anything goes over wifi } - if (mOtaUpdate) { - // OTA update download can use mobile network with no size limits - return NETWORK_OK; - } Long maxBytesOverMobile = mSystemFacade.getMaxBytesOverMobile(); if (maxBytesOverMobile != null && mTotalBytes > maxBytesOverMobile) { return NETWORK_UNUSABLE_DUE_TO_SIZE; diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 208d7856..113be5a5 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -145,9 +145,6 @@ public final class DownloadProvider extends ContentProvider { private static final List<String> downloadManagerColumnsList = Arrays.asList(DownloadManager.UNDERLYING_COLUMNS); - // TODO is there a better way to get this package name - private static final Object GSF_PACKAGE_NAME = "com.google.android.gsf"; - /** The database that lies underneath this content provider */ private SQLiteOpenHelper mOpenHelper = null; @@ -620,13 +617,6 @@ 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) && - (getContext().checkCallingPermission(Downloads.Impl.PERMISSION_ACCESS_ADVANCED) - == PackageManager.PERMISSION_GRANTED)) { - filteredValues.put(Constants.OTA_UPDATE, Boolean.TRUE); - } - if (Constants.LOGVV) { Log.v(Constants.TAG, "initiating download with UID " + filteredValues.getAsInteger(Constants.UID)); |