diff options
| author | 2019-01-10 04:42:37 +0000 | |
|---|---|---|
| committer | 2019-01-10 04:42:37 +0000 | |
| commit | 00c354d0089a1f46d6d27239a68f16b4e21f66a4 (patch) | |
| tree | a5068c584a3a57fc48cf07c061067a32c072cf87 | |
| parent | 6eab9950d69a9c88289dbd20a68e52c53935eae3 (diff) | |
| parent | d9a6af2b4d593284b0a7a200826308bf0f925bfc (diff) | |
Merge "Allow https URIs in convertUriToPath"
| -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)) { |