diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-07 10:41:41 -0800 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-03-07 10:41:41 -0800 |
| commit | b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9 (patch) | |
| tree | 55e74b6d1be75d523d3c4bcfb6241bc6e8f334b4 /drm/java | |
| parent | d7e80b9d5046603ac4a36ea74e204a2ad70a4dca (diff) | |
| download | frameworks_base-b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9.zip frameworks_base-b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9.tar.gz frameworks_base-b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9.tar.bz2 | |
To support uri started with http:// in some Java APIs
Fix for bug 4016388.
Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
Diffstat (limited to 'drm/java')
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index c541456..782ffdb 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -735,6 +735,7 @@ public class DrmManagerClient { * This method expects uri in the following format * content://media/<table_name>/<row_index> (or) * file://sdcard/test.mp4 + * http://test.com/test.mp4 * * Here <table_name> shall be "video" or "audio" or "images" * <row_index> the index of the content in given table @@ -746,6 +747,10 @@ public class DrmManagerClient { if (null == scheme || scheme.equals("") || scheme.equals(ContentResolver.SCHEME_FILE)) { path = uri.getPath(); + + } else if (scheme.equals("http")) { + path = uri.toString(); + } else if (scheme.equals(ContentResolver.SCHEME_CONTENT)) { String[] projection = new String[] {MediaStore.MediaColumns.DATA}; Cursor cursor = null; |