Quellcode durchsuchen

Allow https URIs in convertUriToPath

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

Change-Id: Id3f7e6c002ca2cca6b4c6561fced659882c91d21
ten
Jeff Tinker vor 2 Jahren
Ursprung
Commit
d9a6af2b4d
1 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
  1. 2
    1
      drm/java/android/drm/DrmManagerClient.java

+ 2
- 1
drm/java/android/drm/DrmManagerClient.java Datei anzeigen

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

Laden…
Abbrechen
Speichern