From b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9 Mon Sep 17 00:00:00 2001
From: Gloria Wang <gwang@google.com>
Date: Mon, 7 Mar 2011 10:41:41 -0800
Subject: To support uri started with http:// in some Java APIs Fix for bug
 4016388.

Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
---
 drm/java/android/drm/DrmManagerClient.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'drm/java/android')

diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java
index c541456cd92a..782ffdb8ba44 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;
-- 
cgit v1.2.3-59-g8ed1b