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

Commit 00c354d0 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Allow https URIs in convertUriToPath"

parents 6eab9950 d9a6af2b

drm/java/android/drm/DrmManagerClient.java

+2 −1
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ public class DrmManagerClient implements AutoCloseable { 
     *     content://media/<table_name>/<row_index> (or)

     *     file://sdcard/test.mp4

     *     http://test.com/test.mp4

     *     https://test.com/test.mp4

     *

     * Here <table_name> shall be "video" or "audio" or "images"

     * <row_index> the index of the content in given table
@@ -843,7 +844,7 @@ public class DrmManagerClient implements AutoCloseable { 
                    scheme.equals(ContentResolver.SCHEME_FILE)) {

                path = uri.getPath();



            } else if (scheme.equals("http")) {

            } else if (scheme.equals("http") || scheme.equals("https")) {

                path = uri.toString();



            } else if (scheme.equals(ContentResolver.SCHEME_CONTENT)) {