Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a36d360c authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

am 57a72699: am d686c31b: Merge "To support uri started with http:// in some... 

am 57a72699: am d686c31b: Merge "To support uri started with http:// in some Java APIs Fix for bug 4016388." into honeycomb-mr1

* commit '57a72699':
  To support uri started with http:// in some Java APIs Fix for bug 4016388.
parents 2d5bb293 57a72699

drm/java/android/drm/DrmManagerClient.java

+5 −0
Original line number Diff line number Diff line
@@ -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;