diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-18 12:22:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 12:22:49 -0700 |
| commit | e7d9cd363d6095d37ca25d393c5e86067d3cc5e5 (patch) | |
| tree | 58dc6cd7926ba1c3cf5d8685e4363ce12d6b74dc /core/java/android/provider | |
| parent | 23a2ce1fad31fc8467f3f53d39428e2d1f0a000e (diff) | |
| parent | 15ec7d6d7f23ec197a88619b5e03320cfebd2240 (diff) | |
| download | frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.zip frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.tar.gz frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.tar.bz2 | |
Merge "Add ALLOW_METERED column to DownloadManager."
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Downloads.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/core/java/android/provider/Downloads.java b/core/java/android/provider/Downloads.java index cd8d51f..31ad12b 100644 --- a/core/java/android/provider/Downloads.java +++ b/core/java/android/provider/Downloads.java @@ -329,6 +329,14 @@ public final class Downloads { public static final String COLUMN_IS_PUBLIC_API = "is_public_api"; /** + * The name of the column holding a bitmask of allowed network types. This is only used for + * public API downloads. + * <P>Type: INTEGER</P> + * <P>Owner can Init/Read</P> + */ + public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; + + /** * The name of the column indicating whether roaming connections can be used. This is only * used for public API downloads. * <P>Type: BOOLEAN</P> @@ -337,12 +345,12 @@ public final class Downloads { public static final String COLUMN_ALLOW_ROAMING = "allow_roaming"; /** - * The name of the column holding a bitmask of allowed network types. This is only used for - * public API downloads. - * <P>Type: INTEGER</P> + * The name of the column indicating whether metered connections can be used. This is only + * used for public API downloads. + * <P>Type: BOOLEAN</P> * <P>Owner can Init/Read</P> */ - public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types"; + public static final String COLUMN_ALLOW_METERED = "allow_metered"; /** * Whether or not this download should be displayed in the system's Downloads UI. Defaults @@ -701,7 +709,10 @@ public final class Downloads { * blocked by {@link NetworkPolicyManager}. * * @hide + * @deprecated since behavior now uses + * {@link #STATUS_WAITING_FOR_NETWORK} */ + @Deprecated public static final int STATUS_BLOCKED = 498; /** {@hide} */ |