Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am baf3869b: Merge "Fix up handling of null fields in DownloadManager." into gingerbread

Browse Source 
Merge commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8' into gingerbread-plus-aosp

* commit 'baf3869b88ab4e31f792dbe08f61725bc3619ea8':
  Fix up handling of null fields in DownloadManager.
This commit is contained in:
Steve Howard
2010-08-18 13:38:42 -07:00
committed by Android Git Automerger
parent 7a11ae268c baf3869b88
commit 0899e8bc9d
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/net/DownloadManager.java
View File

@@ -51,14 +51,14 @@ public class DownloadManager {
public final static String COLUMN_ID = "id"; public final static String COLUMN_ID = "id";
/** /**
* The client-supplied title for this download. This will be displayed in system notifications, * The client-supplied title for this download. This will be displayed in system notifications.
* if enabled. * Defaults to the empty string.
*/ */
public final static String COLUMN_TITLE = "title"; public final static String COLUMN_TITLE = "title";
/** /**
* The client-supplied description of this download. This will be displayed in system * The client-supplied description of this download. This will be displayed in system
* notifications, if enabled. * notifications. Defaults to the empty string.
*/ */
public final static String COLUMN_DESCRIPTION = "description"; public final static String COLUMN_DESCRIPTION = "description";
@@ -68,22 +68,24 @@ public class DownloadManager {
public final static String COLUMN_URI = "uri"; public final static String COLUMN_URI = "uri";
/** /**
* Internet Media Type of the downloaded file. This will be filled in based on the server's * Internet Media Type of the downloaded file. If no value is provided upon creation, this will
* response once the download has started. * initially be null and will be filled in based on the server's response once the download has
* started.
* *
* @see <a href="http://www.ietf.org/rfc/rfc1590.txt">RFC 1590, defining Media Types</a> * @see <a href="http://www.ietf.org/rfc/rfc1590.txt">RFC 1590, defining Media Types</a>
*/ */
public final static String COLUMN_MEDIA_TYPE = "media_type"; public final static String COLUMN_MEDIA_TYPE = "media_type";
/** /**
* Total size of the download in bytes. This will be filled in once the download starts. * Total size of the download in bytes. This will initially be -1 and will be filled in once
* the download starts.
*/ */
public final static String COLUMN_TOTAL_SIZE_BYTES = "total_size"; public final static String COLUMN_TOTAL_SIZE_BYTES = "total_size";
/** /**
* Uri where downloaded file will be stored. If a destination is supplied by client, that URI * Uri where downloaded file will be stored. If a destination is supplied by client, that URI
* will be used here. Otherwise, the value will be filled in with a generated URI once the * will be used here. Otherwise, the value will initially be null and will be filled in with a
* download has started. * generated URI once the download has started.
*/ */
public final static String COLUMN_LOCAL_URI = "local_uri"; public final static String COLUMN_LOCAL_URI = "local_uri";
@@ -688,8 +690,13 @@ public class DownloadManager {
if (column.equals(COLUMN_MEDIA_TYPE)) { if (column.equals(COLUMN_MEDIA_TYPE)) {
return getUnderlyingString(Downloads.COLUMN_MIME_TYPE); return getUnderlyingString(Downloads.COLUMN_MIME_TYPE);
} }
assert column.equals(COLUMN_LOCAL_URI); assert column.equals(COLUMN_LOCAL_URI);
return Uri.fromFile(new File(getUnderlyingString(Downloads._DATA))).toString(); String localUri = getUnderlyingString(Downloads._DATA);
if (localUri == null) {
return null;
}
return Uri.fromFile(new File(localUri)).toString();
} }
private long translateLong(String column) { private long translateLong(String column) {