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

Commit d9a6af2b authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Allow https URIs in convertUriToPath 

bug:120049214
test: run cts -m CtsDrmTestCases -t android.drm.cts.DRMTest#testSupportsHttps

Change-Id: Id3f7e6c002ca2cca6b4c6561fced659882c91d21
parent 97dbb7b9

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)) {