diff options
| author | Jeff Tinker <jtinker@google.com> | 2018-11-27 11:35:24 -0800 |
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2019-01-09 06:57:13 +0000 |
| commit | d9a6af2b4d593284b0a7a200826308bf0f925bfc (patch) | |
| tree | f4c472d943eb990fe0f2c06683eb0c72a742b7df | |
| parent | 97dbb7b9684c741ad1c3718fb1cc1e62dc9457e6 (diff) | |
Allow https URIs in convertUriToPath
bug:120049214
test: run cts -m CtsDrmTestCases -t android.drm.cts.DRMTest#testSupportsHttps
Change-Id: Id3f7e6c002ca2cca6b4c6561fced659882c91d21
| -rw-r--r-- | drm/java/android/drm/DrmManagerClient.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/java/android/drm/DrmManagerClient.java b/drm/java/android/drm/DrmManagerClient.java index 76eab4a7905a..fcebad339f2b 100644 --- a/drm/java/android/drm/DrmManagerClient.java +++ b/drm/java/android/drm/DrmManagerClient.java @@ -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)) { |